Unity: Prevent destroy problem with ExecuteInEditMode

masas · Jun 6, 2014 · 5ea0333 · 5ea0333
1 parent bf62a39
commit 5ea0333
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/csharp/unity/dist/lwf.unitypackage b/csharp/unity/dist/lwf.unitypackage
diff --git a/csharp/unity/renderer/bitmapfont/bitmapfont_renderer.cs b/csharp/unity/renderer/bitmapfont/bitmapfont_renderer.cs
@@ -500,7 +500,8 @@ public virtual void RenderNow(Matrix4x4 matrix, Color multColor)
 		material.color = multColor;
 		material.SetPass(0);
 		Graphics.DrawMeshNow(mMesh, matrix);
-		Material.Destroy(material);
+		if (!Application.isEditor)
+			Material.Destroy(material);
 	}
 #endif
 }

diff --git a/csharp/unity/renderer/drawmesh/lwf_drawmesh_bitmap.cs b/csharp/unity/renderer/drawmesh/lwf_drawmesh_bitmap.cs
@@ -220,7 +220,8 @@ public override void RenderNow()
 			material.SetColor("_AdditionalColor", m_colorAdd);
 		material.SetPass(0);
 		Graphics.DrawMeshNow(m_context.mesh, m_renderMatrix);
-		Material.Destroy(material);
+		if (!Application.isEditor)
+			Material.Destroy(material);
 	}
 #endif
 }