[unity] Fixed SkeletonGraphicInspector having inconsistent private ac…

…cess specifier, changed to protected. Closes #2715
EsotericSoftware · Dec 17, 2024 · 951a4d7 · 951a4d7
1 parent 3514e20
commit 951a4d7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs
@@ -57,19 +57,19 @@ public class SkeletonGraphicInspector : UnityEditor.Editor {
 		static GUILayoutOption ReloadButtonWidth { get { return reloadButtonWidth = reloadButtonWidth ?? GUILayout.Width(GUI.skin.label.CalcSize(new GUIContent(ReloadButtonString)).x + 20); } }
 		static GUIStyle ReloadButtonStyle { get { return EditorStyles.miniButton; } }
 
-		SerializedProperty material, color;
-		SerializedProperty additiveMaterial, multiplyMaterial, screenMaterial;
-		SerializedProperty skeletonDataAsset, initialSkinName;
-		SerializedProperty startingAnimation, startingLoop, timeScale, freeze,
+		protected SerializedProperty material, color;
+		protected SerializedProperty additiveMaterial, multiplyMaterial, screenMaterial;
+		protected SerializedProperty skeletonDataAsset, initialSkinName;
+		protected SerializedProperty startingAnimation, startingLoop, timeScale, freeze,
 			updateTiming, updateWhenInvisible, unscaledTime, layoutScaleMode, editReferenceRect;
-		SerializedProperty physicsPositionInheritanceFactor, physicsRotationInheritanceFactor, physicsMovementRelativeTo;
-		SerializedProperty initialFlipX, initialFlipY;
-		SerializedProperty meshGeneratorSettings;
-		SerializedProperty useClipping, zSpacing, tintBlack, canvasGroupCompatible, pmaVertexColors, addNormals, calculateTangents, immutableTriangles;
+		protected SerializedProperty physicsPositionInheritanceFactor, physicsRotationInheritanceFactor, physicsMovementRelativeTo;
+		protected SerializedProperty initialFlipX, initialFlipY;
+		protected SerializedProperty meshGeneratorSettings;
+		protected SerializedProperty useClipping, zSpacing, tintBlack, canvasGroupCompatible, pmaVertexColors, addNormals, calculateTangents, immutableTriangles;
 
-		SerializedProperty allowMultipleCanvasRenderers, separatorSlotNames, enableSeparatorSlots,
+		protected SerializedProperty allowMultipleCanvasRenderers, separatorSlotNames, enableSeparatorSlots,
 			updateSeparatorPartLocation, updateSeparatorPartScale;
-		SerializedProperty raycastTarget, maskable;
+		protected SerializedProperty raycastTarget, maskable;
 
 		readonly GUIContent UseClippingLabel = new GUIContent("Use Clipping",
 			"When disabled, clipping attachments are ignored. This may be used to save performance.");
@@ -94,7 +94,7 @@ public class SkeletonGraphicInspector : UnityEditor.Editor {
 			"Calculates the tangents per frame. Use this if you are using lit shaders (usually with normal maps) that " +
 			"require vertex tangents.");
 		readonly GUIContent ImmutableTrianglesLabel = new GUIContent("Immutable Triangles",
-			"Enable to optimize rendering for skeletons that never change attachment visbility");
+			"Enable to optimize rendering for skeletons that never change attachment visibility");
 
 		readonly GUIContent UnscaledTimeLabel = new GUIContent("Unscaled Time",
 			"If enabled, AnimationState uses unscaled game time (Time.unscaledDeltaTime), " +
@@ -138,7 +138,7 @@ protected bool TargetIsValid {
 			}
 		}
 
-		void OnEnable () {
+		protected virtual void OnEnable () {
 #if NEW_PREFAB_SYSTEM
 			isInspectingPrefab = false;
 #else
@@ -211,7 +211,7 @@ void OnEnable () {
 #endif
 		}
 
-		void OnDisable () {
+		protected virtual void OnDisable () {
 #if NEWPLAYMODECALLBACKS
 			EditorApplication.playModeStateChanged -= OnPlaymodeChanged;
 #else
@@ -221,14 +221,14 @@ void OnDisable () {
 		}
 
 #if NEWPLAYMODECALLBACKS
-		void OnPlaymodeChanged (PlayModeStateChange mode) {
+		protected virtual void OnPlaymodeChanged (PlayModeStateChange mode) {
 #else
 		void OnPlaymodeChanged () {
 #endif
 			DisableEditReferenceRectMode();
 		}
 
-		void DisableEditReferenceRectMode () {
+		protected virtual void DisableEditReferenceRectMode () {
 			foreach (UnityEngine.Object c in targets) {
 				SkeletonGraphic component = (SkeletonGraphic)c;
 				component.EditReferenceRect = false;

diff --git a/spine-unity/Assets/Spine/package.json b/spine-unity/Assets/Spine/package.json
@@ -2,7 +2,7 @@
 	"name": "com.esotericsoftware.spine.spine-unity",
 	"displayName": "spine-unity Runtime",
 	"description": "This plugin provides the spine-unity runtime core.",
-	"version": "4.2.92",
+	"version": "4.2.93",
 	"unity": "2018.3",
 	"author": {
 		"name": "Esoteric Software",