UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-13 18:48:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
NathanSweet 2014-09-28 23:26:32 +02:00
commit 9a1447b799
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spine-unity/Assets/spine-unity/Editor/SkeletonAnimationInspector.cs
View File

@ -67,6 +67,7 @@ public class SkeletonAnimationInspector : SkeletonRendererInspector {
}
//TODO: Refactor this to use GenericMenu and callbacks to avoid interfering with control by other behaviours.
// Animation name.
{
String[] animations = new String[component.skeleton.Data.Animations.Count + 1];
@ -85,8 +86,10 @@ public class SkeletonAnimationInspector : SkeletonRendererInspector {
EditorGUILayout.EndHorizontal();
String selectedAnimationName = animationIndex == 0 ? null : animations[animationIndex];
component.AnimationName = selectedAnimationName;
animationName.stringValue = selectedAnimationName;
if(component.AnimationName != selectedAnimationName){
component.AnimationName = selectedAnimationName;
animationName.stringValue = selectedAnimationName;
}
}