another fix to material restoring

WondermSwift · Oct 31, 2016 · d90380f · d90380f
1 parent 353c0d1
commit d90380f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Editor/VertexPainterWindow_Painting.cs b/Editor/VertexPainterWindow_Painting.cs
@@ -1251,7 +1251,8 @@ void UpdateDisplayMode(bool endPainting = true)
                if (!showVertexShader || !enabled)
                {
                   // restore..
-                  if (job.stream.originalMaterial != null && job.stream.originalMaterial.Length > 0)
+                  if (job.stream.originalMaterial != null && job.stream.originalMaterial.Length > 0 &&
+                      job.renderer.sharedMaterial == VertexInstanceStream.vertexShaderMat)
                   {
                      if (job.renderer.sharedMaterials != null && job.renderer.sharedMaterials.Length > 1 &&
                          job.renderer.sharedMaterials.Length == job.stream.originalMaterial.Length)
@@ -1269,6 +1270,10 @@ void UpdateDisplayMode(bool endPainting = true)
                         job.renderer.sharedMaterial = job.stream.originalMaterial[0];
                      }
                   }
+                  else if (job.renderer.sharedMaterial != VertexInstanceStream.vertexShaderMat)
+                  {
+                     job.CaptureMat();
+                  }
                }
                else if (showVertexShader)
                {