From 35a7a7be7637786c0613e246b4feb750d71ae707 Mon Sep 17 00:00:00 2001
From: pharan <johndygit@live.com.ph>
Date: Fri, 5 Aug 2016 18:30:14 +0800
Subject: [PATCH] [unity] Fix SkeletonRenderSeparator edit mode refresh.

---
 .../Editor/SkeletonRendererInspector.cs       | 21 +++++++++++++++++++
 .../SkeletonRenderSeparatorInspector.cs       | 16 +++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs b/spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs
index d79c6eef5..647e96a7b 100644
--- a/spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs
+++ b/spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs
@@ -63,6 +63,27 @@ namespace Spine.Unity.Editor {
 			sortingProperties = new SpineInspectorUtility.SerializedSortingProperties(renderer);
 		}
 
+		public static void ReapplySeparatorSlotNames (SkeletonRenderer skeletonRenderer) {
+			if (!skeletonRenderer.valid) return;
+
+			var separatorSlots = skeletonRenderer.separatorSlots;
+			var separatorSlotNames = skeletonRenderer.separatorSlotNames;
+			var skeleton = skeletonRenderer.skeleton;
+
+			separatorSlots.Clear();
+			for (int i = 0, n = separatorSlotNames.Length; i < n; i++) {
+				var slot = skeleton.FindSlot(separatorSlotNames[i]);
+				if (slot != null) {
+					separatorSlots.Add(slot);
+					//Debug.Log(slot + " added as separator.");
+				} else {
+					Debug.LogWarning(separatorSlotNames[i] + " is not a slot in " + skeletonRenderer.skeletonDataAsset.skeletonJSON.name);				
+				}
+			}
+
+			//Debug.Log("Reapplied Separator Slot Names. Count is now: " + separatorSlots.Count);
+		}
+
 		protected virtual void DrawInspectorGUI () {
 			// JOHN: todo: support multiediting.
 			SkeletonRenderer component = (SkeletonRenderer)target;
diff --git a/spine-unity/Assets/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonRenderSeparatorInspector.cs b/spine-unity/Assets/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonRenderSeparatorInspector.cs
index 26455fe5f..c75eaa89b 100644
--- a/spine-unity/Assets/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonRenderSeparatorInspector.cs
+++ b/spine-unity/Assets/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonRenderSeparatorInspector.cs
@@ -48,6 +48,7 @@ namespace Spine.Unity.Modules {
 		SerializedObject skeletonRendererSerializedObject;
 		SerializedProperty separatorNamesProp;
 		static bool skeletonRendererExpanded = true;
+		bool slotsReapplyRequired = false;
 
 		void OnEnable () {
 			if (component == null)
@@ -133,9 +134,15 @@ namespace Spine.Unity.Modules {
 						EditorGUILayout.HelpBox("Separators are empty. Change the size to 1 and choose a slot if you want the render to be separated.", MessageType.Info);
 					}
 				}
-				if (EditorGUI.EndChangeCheck())
+
+				if (EditorGUI.EndChangeCheck()) {
 					skeletonRendererSerializedObject.ApplyModifiedProperties();
 
+					if (!Application.isPlaying)
+						slotsReapplyRequired = true;
+				}
+					
+
 				totalParts = separatorCount + 1;
 				var counterStyle = skeletonRendererExpanded ? EditorStyles.label : EditorStyles.miniLabel;
 				EditorGUILayout.LabelField(string.Format("{0}: separates into {1}.", SpineInspectorUtility.Pluralize(separatorCount, "separator", "separators"), SpineInspectorUtility.Pluralize(totalParts, "part", "parts") ), counterStyle);
@@ -197,6 +204,13 @@ namespace Spine.Unity.Modules {
 			}
 
 			serializedObject.ApplyModifiedProperties();
+
+			if (slotsReapplyRequired && UnityEngine.Event.current.type == EventType.Repaint) {
+				SkeletonRendererInspector.ReapplySeparatorSlotNames(component.SkeletonRenderer);
+				component.SkeletonRenderer.LateUpdate();
+				SceneView.RepaintAll();
+				slotsReapplyRequired = false;
+			}
 		}
 
 		public void AddPartsRenderer (int count) {