added ifdef for animationClip.SetCurve at runtime (only works with le…

…gacy animations clips)
KhronosGroup · Sep 28, 2023 · 460edb1 · 460edb1
1 parent 99a35dd
commit 460edb1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Runtime/Scripts/GLTFSceneImporter.cs b/Runtime/Scripts/GLTFSceneImporter.cs
@@ -37,7 +37,7 @@ public class ImportOptions
 		public IDataLoader DataLoader = null;
 		public AsyncCoroutineHelper AsyncCoroutineHelper = null;
 		public bool ThrowOnLowMemory = true;
-		public AnimationMethod AnimationMethod = AnimationMethod.Mecanim;
+		public AnimationMethod AnimationMethod = AnimationMethod.Legacy;
 		public bool AnimationLoopTime = true;
 		public bool AnimationLoopPose = false;
 

diff --git a/Runtime/Scripts/SceneImporter/ImporterAnimation.cs b/Runtime/Scripts/SceneImporter/ImporterAnimation.cs
@@ -161,7 +161,12 @@ protected virtual async Task BuildAnimationSamplers(GLTFAnimation animation, int
 
 				// copy all key frames data to animation curve and add it to the clip
 				AnimationCurve curve = new AnimationCurve(keyframes[ci]);
-				clip.SetCurve(relativePath, curveType, propertyNames[ci], curve);
+
+#if !UNITY_EDITOR
+				// Only in editor SetCurve works with non-legacy clips
+				if (clip.legacy)
+#endif 
+					clip.SetCurve(relativePath, curveType, propertyNames[ci], curve);
 			}
 		}