Add null check for prefab editor

mob-sakai · Dec 17, 2018 · a0e32d6 · a0e32d6
1 parent 74f6180
commit a0e32d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Scripts/SoftMask.cs b/Scripts/SoftMask.cs
@@ -340,7 +340,10 @@ static void UpdateMaskTextures()
 		{
 			foreach (var sm in s_ActiveSoftMasks)
 			{
-				sm.UpdateMaskTexture();
+				if(sm)
+				{
+					sm.UpdateMaskTexture ();
+				}
 			}
 		}
 

diff --git a/Scripts/SoftMaskable.cs b/Scripts/SoftMaskable.cs
@@ -158,11 +158,14 @@ static void UpdateSceneViewMatrixForShader()
 
 			foreach (var sm in s_ActiveSoftMaskables)
 			{
-				Material mat = sm._maskMaterial;
-				if (mat)
+				if(sm)
 				{
-					mat.SetMatrix("_SceneView", w2c);
-					mat.SetMatrix("_SceneProj", prj);
+					Material mat = sm._maskMaterial;
+					if (mat)
+					{
+						mat.SetMatrix ("_SceneView", w2c);
+						mat.SetMatrix ("_SceneProj", prj);
+					}
 				}
 			}
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -340,7 +340,10 @@ static void UpdateMaskTextures() @@
     		{
     			foreach (var sm in s_ActiveSoftMasks)
     			{
-    				sm.UpdateMaskTexture();
+    				if(sm)
+    				{
+    					sm.UpdateMaskTexture ();
+    				}
     			}
     		}
@@ Expand Down @@