Merge pull request #1251 from anatawa12/fix-compile-error

fix: compile error with merge conflict
anatawa12 · Oct 12, 2024 · 259a493 · 259a493
2 parents c1914f5 + f80d0b9
commit 259a493
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Editor/Processors/SkinnedMeshes/RenameBlendShapeProcessor.cs b/Editor/Processors/SkinnedMeshes/RenameBlendShapeProcessor.cs
@@ -212,7 +212,7 @@ private void WarnErrorConflicts(List<(string name, float weight, List<string> so
                     BuildLog.LogWarning("RenameBlendShape:warning:weight-conflict", name, string.Join(", ", sources));
 
                 // animation checks (we only check for isAnimated, for now
-                var partiallyAnimated = sources.Select(source => animationComponent.TryGetFloat($"blendShape.{source}", out _)).Distinct().Count() > 1;
+                var partiallyAnimated = sources.Select(source => animationComponent.ContainsAnimationForFloat($"blendShape.{source}")).Distinct().Count() > 1;
                 if (partiallyAnimated)
                     BuildLog.LogWarning("RenameBlendShape:warning:animation-conflict", name, string.Join(", ", sources));
             }