fix: nullReferenceException after copy-n-paste

close #258
mob-sakai · Aug 14, 2023 · 24730d3 · 24730d3
1 parent bd43e8c
commit 24730d3
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/Scripts/UIParticleRenderer.cs b/Scripts/UIParticleRenderer.cs
@@ -112,7 +112,12 @@ public override Material GetModifiedMaterial(Material baseMaterial)
         {
             _currentMaterialForRendering = null;
 
-            if (!IsActive()) return baseMaterial;
+            if (!IsActive() || !_parent)
+            {
+                ModifiedMaterial.Remove(_modifiedMaterial);
+                _modifiedMaterial = null;
+                return baseMaterial;
+            }
 
             var modifiedMaterial = base.GetModifiedMaterial(baseMaterial);
 
@@ -157,6 +162,12 @@ public void Reset(int index = -1)
                 _lastBounds = new Bounds();
                 enabled = false;
             }
+            else
+            {
+                ModifiedMaterial.Remove(_modifiedMaterial);
+                _modifiedMaterial = null;
+                _currentMaterialForRendering = null;
+            }
         }
 
         public void Set(UIParticle parent, ParticleSystem particleSystem, bool isTrail)