Minor cleanup and additional nullchecks.

2013-05-03 14:29:55 -05:00
parent 31eb3e8d24
commit 701fc87c05
3 changed files with 6 additions and 3 deletions
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1066,6 +1066,10 @@ bool LLFace::canRenderAsMask()
 	}

 	const LLTextureEntry* te = getTextureEntry();
+	if( !te || !getViewerObject() || !getTexture() )
+	{
+		return false;
+	}

 	static const LLCachedControl<bool> use_rmse_auto_mask("SHUseRMSEAutoMask",false);
 	static const LLCachedControl<F32> auto_mask_max_rmse("SHAutoMaskMaxRMSE",.09f);