Bugfixes

decentraland · Mar 20, 2024 · 7073746 · 7073746
1 parent f816659
commit 7073746
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleConverter.cs b/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleConverter.cs
@@ -464,6 +464,7 @@ private void CreateAnimatorController(IGltfImport gltfImport, string directory)
                 var state = controller.AddMotion(newCopy, 0);
                 var anyStateTransition = rootStateMachine.AddAnyStateTransition(state);
                 anyStateTransition.AddCondition(AnimatorConditionMode.If, 0, animationClipName);
+                anyStateTransition.duration = 0;
             }
 
             AssetDatabase.SaveAssets();

diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/Editor/CustomGltfImporter.cs b/asset-bundle-converter/Assets/AssetBundleConverter/Editor/CustomGltfImporter.cs
@@ -96,10 +96,14 @@ private void ReferenceAnimatorController(AssetImportContext ctx)
             if (gameObject != null)
             {
                 Animator animator = gameObject.GetComponent<Animator>();
-                var folderName = $"{Path.GetDirectoryName(ctx.assetPath)}/Animator/";
-                string filePath = folderName + "animatorController.controller";
-                AnimatorController animationController = AssetDatabase.LoadAssetAtPath<AnimatorController>(filePath);
-                animator.runtimeAnimatorController = animationController;
+
+                if (animator != null)
+                {
+                    var folderName = $"{Path.GetDirectoryName(ctx.assetPath)}/Animator/";
+                    string filePath = folderName + "animatorController.controller";
+                    AnimatorController animationController = AssetDatabase.LoadAssetAtPath<AnimatorController>(filePath);
+                    animator.runtimeAnimatorController = animationController;
+                }
             }
         }