Merge pull request #1122 from anatawa12/fix-nre

fix: NRE with Generic Avatar
anatawa12 · Jul 21, 2024 · f15a8f0 · f15a8f0
2 parents 1e4155d + de8bd14
commit f15a8f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog].
 
 ### Fixed
 - Index out of bounds error with remove mesh by mask `#1119`
+- NRE with Generic Avatar `#1122`
 
 ### Security
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog].
 
 ### Fixed
 - Index out of bounds error with remove mesh by mask `#1119`
+- NRE with Generic Avatar `#1122`
 
 ### Security
 

diff --git a/Editor/AnimatorParserV2/NodeContainer.cs b/Editor/AnimatorParserV2/NodeContainer.cs
@@ -39,8 +39,10 @@ internal class RootPropModNodeContainer : INodeContainer<RootPropModNode<float>,
         public IReadOnlyDictionary<(ComponentOrGameObject target, string prop), RootPropModNode<Object>> ObjectNodes =>
             _objectNodes;
 
-        public void Add(ComponentNodeContainer container, bool alwaysApplied)
+        public void Add([CanBeNull] ComponentNodeContainer container, bool alwaysApplied)
         {
+            if (container == null) return;
+
             foreach (var (key, value) in container.FloatNodes)
             {
                 if (!FloatNodes.TryGetValue(key, out var node))