From 24730d38985874ba4061026390e6929a724a7cc6 Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Mon, 14 Aug 2023 15:47:07 +0900 Subject: [PATCH] fix: nullReferenceException after copy-n-paste close #258 --- Scripts/UIParticleRenderer.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Scripts/UIParticleRenderer.cs b/Scripts/UIParticleRenderer.cs index 79f81c6..c81e2dc 100644 --- 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)