diff --git a/spine-unity/Assets/Spine Examples/Scripts/FootSoldierExample.cs b/spine-unity/Assets/Spine Examples/Scripts/FootSoldierExample.cs index 66ab2ceb5..e723b5ab9 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/FootSoldierExample.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/FootSoldierExample.cs @@ -70,7 +70,7 @@ namespace Spine.Unity.Examples { } void Apply (SkeletonRenderer skeletonRenderer) { - StartCoroutine("Blink"); + StartCoroutine(Blink()); } void Update () { diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineAtlasAssetInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineAtlasAssetInspector.cs index f1c702563..6614da270 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineAtlasAssetInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineAtlasAssetInspector.cs @@ -108,7 +108,7 @@ namespace Spine.Unity.Editor { } serializedObject.Update(); - atlasAsset = atlasAsset ?? (SpineAtlasAsset)target; + atlasAsset = (atlasAsset == null) ? (SpineAtlasAsset)target : atlasAsset; EditorGUI.BeginChangeCheck(); EditorGUILayout.PropertyField(atlasFile); EditorGUILayout.PropertyField(materials, true); diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineSpriteAtlasAssetInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineSpriteAtlasAssetInspector.cs index 14451ee0b..6820b56e9 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineSpriteAtlasAssetInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineSpriteAtlasAssetInspector.cs @@ -71,7 +71,7 @@ namespace Spine.Unity.Editor { } serializedObject.Update(); - atlasAsset = atlasAsset ?? (SpineSpriteAtlasAsset)target; + atlasAsset = (atlasAsset == null) ? (SpineSpriteAtlasAsset)target : atlasAsset; if (atlasAsset.RegionsNeedLoading) { if (GUILayout.Button(SpineInspectorUtility.TempContent("Load regions by entering Play mode"), GUILayout.Height(20))) { diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs index 49716df16..a4bf07057 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs @@ -621,7 +621,7 @@ namespace Spine.Unity.Editor { int[] triangles = attachment.Triangles; Color color = new Color(attachment.R, attachment.G, attachment.B, attachment.A); - mesh = mesh ?? new Mesh(); + mesh = (mesh == null) ? new Mesh() : mesh; mesh.triangles = new int[0]; diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateBehaviour.cs b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateBehaviour.cs index 685a1c2e7..5f38fa54e 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateBehaviour.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateBehaviour.cs @@ -48,7 +48,9 @@ namespace Spine.Unity.Playables { public bool customDuration = false; public bool useBlendDuration = true; [SerializeField] + #pragma warning disable 414 private bool isInitialized = false; // required to read preferences values from editor side. + #pragma warning restore 414 public float mixDuration = 0.1f; [Range(0, 1f)]