Skip to content

Commit e623300

Browse files
committed
Move null checks within DrawTexture
1 parent 50be47d commit e623300

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Assets/Scripts/Game/Utility/PaperDollRenderer.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,9 @@ void DrawTexture(ImageData srcImage, DaggerfallUnityItem item = null)
246246

247247
void DrawTexture(ImageData srcImage, Rect srcRect, Rect targetRect, DaggerfallUnityItem item = null)
248248
{
249+
if (srcImage.texture == null)
250+
return;
251+
249252
// Calculate image position relative to origin
250253
int posX = (int)targetRect.xMin - paperDollOrigin.X;
251254
int posY = (int)targetRect.yMin - paperDollOrigin.Y;
@@ -265,7 +268,7 @@ void DrawTexture(ImageData srcImage, Rect srcRect, Rect targetRect, DaggerfallUn
265268
TextureReplacement.OverridePaperdollItemRect(item, srcImage, scale, ref screenRect);
266269

267270
// Draw with custom shader for paper doll item masking
268-
if (item != null)
271+
if (item != null && srcImage.maskTexture != null)
269272
{
270273
paperDollMaterial.SetTexture("_MaskTex", srcImage.maskTexture);
271274
Graphics.DrawTexture(screenRect, srcImage.texture, srcRect, 0, 0, 0, 0, paperDollMaterial);
@@ -382,8 +385,7 @@ void BlitCloakInterior(PlayerEntity entity)
382385
if (cloak2 != null)
383386
{
384387
ImageData interior2 = DaggerfallUnity.Instance.ItemHelper.GetCloakInteriorImage(cloak2);
385-
if (interior2.texture != null)
386-
DrawTexture(interior2, cloak2);
388+
DrawTexture(interior2, cloak2);
387389
return;
388390
}
389391

@@ -392,8 +394,7 @@ void BlitCloakInterior(PlayerEntity entity)
392394
if (cloak1 != null)
393395
{
394396
ImageData interior1 = DaggerfallUnity.Instance.ItemHelper.GetCloakInteriorImage(cloak1);
395-
if (interior1.texture != null)
396-
DrawTexture(interior1, cloak1);
397+
DrawTexture(interior1, cloak1);
397398
}
398399
}
399400

0 commit comments

Comments
 (0)