From a03b0cc288e726567cb629a9071090b09c17d481 Mon Sep 17 00:00:00 2001 From: pharan Date: Mon, 1 Oct 2018 22:02:14 +0800 Subject: [PATCH] [unity] Fix SkeletonPartsRendererInspector multi-edit. --- .../Editor/SkeletonPartsRendererInspector.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonPartsRendererInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonPartsRendererInspector.cs index 81eda3f98..b6cebad64 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonPartsRendererInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonPartsRendererInspector.cs @@ -38,17 +38,20 @@ namespace Spine.Unity.Modules { SpineInspectorUtility.SerializedSortingProperties sortingProperties; void OnEnable () { - sortingProperties = new SpineInspectorUtility.SerializedSortingProperties((target as Component).GetComponent()); + sortingProperties = new SpineInspectorUtility.SerializedSortingProperties(SpineInspectorUtility.GetRenderersSerializedObject(serializedObject)); } public override void OnInspectorGUI () { SpineInspectorUtility.SortingPropertyFields(sortingProperties, true); - EditorGUILayout.Space(); - if (SpineInspectorUtility.LargeCenteredButton(new GUIContent("Select SkeletonRenderer", SpineEditorUtilities.Icons.spine))) { - var thisSkeletonPartsRenderer = target as SkeletonPartsRenderer; - var srs = thisSkeletonPartsRenderer.GetComponentInParent(); - if (srs != null && srs.partsRenderers.Contains(thisSkeletonPartsRenderer) && srs.SkeletonRenderer != null) - Selection.activeGameObject = srs.SkeletonRenderer.gameObject; + + if (!serializedObject.isEditingMultipleObjects) { + EditorGUILayout.Space(); + if (SpineInspectorUtility.LargeCenteredButton(new GUIContent("Select SkeletonRenderer", SpineEditorUtilities.Icons.spine))) { + var thisSkeletonPartsRenderer = target as SkeletonPartsRenderer; + var srs = thisSkeletonPartsRenderer.GetComponentInParent(); + if (srs != null && srs.partsRenderers.Contains(thisSkeletonPartsRenderer) && srs.SkeletonRenderer != null) + Selection.activeGameObject = srs.SkeletonRenderer.gameObject; + } } } }