fix(animation-mixer): handle null property without crashing

arenaxr · Feb 21, 2023 · 906f4b9 · 906f4b9
1 parent e7a412f
commit 906f4b9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Runtime/ArenaUnity.cs b/Runtime/ArenaUnity.cs
@@ -820,15 +820,15 @@ internal static void ToArenaAnimationMixer(GameObject gobj, ref JObject jData)
         }
         internal static void ToUnityAnimationMixer(dynamic data, JObject jData, ref GameObject gobj)
         {
-            ArenaAnimationMixer am = gobj.GetComponent<ArenaAnimationMixer>();
-            if (am == null)
-                am = gobj.AddComponent<ArenaAnimationMixer>();
             JToken amObj = jData.SelectToken("animation-mixer");
-            if (amObj != null)
+            if (amObj != null && amObj.HasValues)
             {
+                ArenaAnimationMixer am = gobj.GetComponent<ArenaAnimationMixer>();
+                if (am == null)
+                    am = gobj.AddComponent<ArenaAnimationMixer>();
                 am.json = ArenaAnimationMixerJson.CreateFromJSON(JsonConvert.SerializeObject(amObj), amObj);
+                am.apply = true;
             }
-            am.apply = true;
         }
     }
 }