check for null renderers on all operations

Author: al2me6

Source/DynamicProperties/MaterialPropertyManager.cs

@@ -57,10 +57,7 @@ private void OnDestroy()
 
 	public bool Set(Renderer renderer, Props props)
 	{
-		if (renderer == null) {
-			this.LogWarning($"cannot set property on null renderer {renderer.GetHashCode()}");
-			return false;
-		}
+		if (!CheckRendererAlive(renderer)) return false;
 
 		if (!rendererCascades.TryGetValue(renderer, out var cascade)) {
 			rendererCascades[renderer] = cascade = new PropsCascade(renderer);
@@ -69,15 +66,18 @@ public bool Set(Renderer renderer, Props props)
 		return cascade.Add(props);
 	}
 
-	public bool Remove(Renderer renderer, Props props)
+	public bool Unset(Renderer renderer, Props props)
 	{
+		if (!CheckRendererAlive(renderer)) return false;
 		if (!rendererCascades.TryGetValue(renderer, out var cascade)) return false;
 		return cascade.Remove(props);
 	}
 
-	public bool Remove(Renderer renderer)
+	public bool Unregister(Renderer renderer)
 	{
+		if ((object)renderer == null) return false;
 		if (!rendererCascades.Remove(renderer, out var cascade)) return false;
+		if (renderer == null) this.LogDebug($"dead renderer {renderer.GetHashCode()}");
 		cascade.Dispose();
 		return true;
 	}
@@ -89,10 +89,34 @@ public static void RegisterPropertyNamesForDebugLogging(params string[] properti
 
 	#endregion
 
+	private bool CheckRendererAlive(Renderer renderer)
+	{
+		if (renderer != null) return true;
+		this.LogWarning($"cannot modify null renderer {renderer?.GetHashCode()}");
+		if ((object)renderer != null) Unregister(renderer);
+		return false;
+	}
+
+	private readonly List<Renderer> _deadRenderers = [];
+
+	internal void CheckRemoveDeadRenderers()
+	{
+		foreach (var renderer in rendererCascades.Keys) {
+			if (renderer == null) _deadRenderers.Add(renderer);
+		}
+
+		foreach (var deadRenderer in _deadRenderers) Unregister(deadRenderer);
+		_deadRenderers.Clear();
+	}
+
 	/// Public API equivalent is calling `Props.Dispose`.
-	internal void Remove(Props props)
+	internal void Unregister(Props props)
 	{
-		foreach (var cascade in rendererCascades.Values) cascade.Remove(props);
+		foreach (var (renderer, cascade) in rendererCascades) {
+			if (renderer != null) cascade.Remove(props);
+		}
+
+		CheckRemoveDeadRenderers();
 	}
 
 	private bool _propRefreshScheduled = false;

Source/DynamicProperties/MpbCompiler.cs

@@ -47,7 +47,7 @@ internal void Register(Renderer renderer)
 	internal void Unregister(Renderer renderer)
 	{
 		linkedRenderers.Remove(renderer);
-		if (renderer != null) renderer.SetPropertyBlock(EmptyMpb);
+		if (renderer) renderer.SetPropertyBlock(EmptyMpb);
 
 		if (linkedRenderers.Count > 0) return;
 		Log.Debug(
@@ -111,25 +111,19 @@ private void RewriteMpb()
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private void Apply(Renderer renderer) => renderer.SetPropertyBlock(mpb);
 
-	private readonly List<Renderer> _deadRenderers = [];
-
 	private void ApplyAll()
 	{
+		var hasDeadRenderer = false;
+
 		foreach (var renderer in linkedRenderers) {
-			if (renderer == null) {
-				_deadRenderers.Add(renderer!);
-				continue;
+			if (renderer != null) {
+				Apply(renderer);
+			} else {
+				hasDeadRenderer = true;
 			}
-
-			Apply(renderer);
-		}
-
-		foreach (var dead in _deadRenderers) {
-			MaterialPropertyManager.Instance?.LogDebug($"dead renderer {dead.GetHashCode()}");
-			MaterialPropertyManager.Instance?.Remove(dead);
 		}
 
-		_deadRenderers.Clear();
+		if (hasDeadRenderer) MaterialPropertyManager.Instance?.CheckRemoveDeadRenderers();
 	}
 
 	#endregion

Source/DynamicProperties/Props.cs

@@ -164,5 +164,5 @@ internal void Write(int id, MaterialPropertyBlock mpb)
 	}
 
 	protected override bool IsUnused() => OnEntriesChanged == null && OnValueChanged == null;
-	protected override void OnDispose() => MaterialPropertyManager.Instance?.Remove(this);
+	protected override void OnDispose() => MaterialPropertyManager.Instance?.Unregister(this);
 }