UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #287 from Fenrisul/master

Browse Source 
[Bugfix] SpineUnity SkeletonAnimationInspector mistake from last commit
This commit is contained in:
Nathan Sweet 2014-09-14 09:18:33 +02:00
commit bcd39886c5
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,14 +63,6 @@ public class SkeletonAnimationInspector : SkeletonRendererInspector {
if(component.AnimationName != animationName.stringValue){ if(component.AnimationName != animationName.stringValue){
animationName.stringValue = currentState.Animation.Name; 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(loop);
EditorGUILayout.PropertyField(timeScale); EditorGUILayout.PropertyField(timeScale);
component.timeScale = Math.Max(component.timeScale, 0); component.timeScale = Math.Max(component.timeScale, 0);
EditorGUILayout.Space(); EditorGUILayout.Space();
if(!isPrefab){ if(!isPrefab){