Merge pull request #287 from Fenrisul/master

[Bugfix] SpineUnity SkeletonAnimationInspector mistake from last commit
This commit is contained in:
Nathan Sweet 2014-09-14 09:18:33 +02:00
commit bcd39886c5

View File

@ -63,14 +63,6 @@ public class SkeletonAnimationInspector : SkeletonRendererInspector {
if(component.AnimationName != animationName.stringValue){
animationName.stringValue = currentState.Animation.Name;
}
if(loop.boolValue != currentState.Loop){
loop.boolValue = currentState.Loop;
}
if(timeScale.floatValue != currentState.TimeScale){
timeScale.floatValue = currentState.TimeScale;
}
}
}
@ -102,6 +94,7 @@ public class SkeletonAnimationInspector : SkeletonRendererInspector {
EditorGUILayout.PropertyField(loop);
EditorGUILayout.PropertyField(timeScale);
component.timeScale = Math.Max(component.timeScale, 0);
EditorGUILayout.Space();
if(!isPrefab){