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

[unity] Cleanup line endings.

Browse Source
This commit is contained in:
pharan 2017-06-29 17:14:27 +08:00
parent c9c360fa88
commit 216441ac4a
5 changed files with 418 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs
View File

@ -101,6 +101,7 @@ namespace Spine.Unity.Editor {
} }
position = EditorGUI.PrefixLabel(position, label); position = EditorGUI.PrefixLabel(position, label);
var image = Icon; var image = Icon;
var propertyStringValue = (property.hasMultipleDifferentValues) ? SpineInspectorUtility.EmDash : property.stringValue; var propertyStringValue = (property.hasMultipleDifferentValues) ? SpineInspectorUtility.EmDash : property.stringValue;
if (GUI.Button(position, string.IsNullOrEmpty(propertyStringValue) ? NoneLabel(image) : SpineInspectorUtility.TempContent(propertyStringValue, image), EditorStyles.popup)) if (GUI.Button(position, string.IsNullOrEmpty(propertyStringValue) ? NoneLabel(image) : SpineInspectorUtility.TempContent(propertyStringValue, image), EditorStyles.popup))

2
spine-unity/Assets/spine-unity/SkeletonAnimation.cs
View File

@ -126,7 +126,7 @@ namespace Spine.Unity {
} }
#endregion #endregion
protected override void ClearState () { public override void ClearState () {
base.ClearState(); base.ClearState();
if (state != null) state.ClearTracks(); if (state != null) state.ClearTracks();
} }

2
spine-unity/Assets/spine-unity/SkeletonRenderer.cs
View File

@ -149,7 +149,7 @@ namespace Spine.Unity {
rendererBuffers.Dispose(); rendererBuffers.Dispose();
} }
protected virtual void ClearState () { public virtual void ClearState () {
meshFilter.sharedMesh = null; meshFilter.sharedMesh = null;
currentInstructions.Clear(); currentInstructions.Clear();
if (skeleton != null) skeleton.SetToSetupPose(); if (skeleton != null) skeleton.SetToSetupPose();