park.saerom преди 4 години
родител
ревизия
0a73ce902c
променени са 1 файла, в които са добавени 7 реда и са изтрити 6 реда
  1. 7 6
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs

+ 7 - 6
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs

@@ -87,12 +87,13 @@ namespace Spine.Unity {
 			#if NEW_PREFAB_SYSTEM
 			#if NEW_PREFAB_SYSTEM
 				if (UnityEditor.PrefabUtility.IsPartOfAnyPrefab(meshFilter)) {
 				if (UnityEditor.PrefabUtility.IsPartOfAnyPrefab(meshFilter)) {
 					var instanceRoot = UnityEditor.PrefabUtility.GetOutermostPrefabInstanceRoot(meshFilter);
 					var instanceRoot = UnityEditor.PrefabUtility.GetOutermostPrefabInstanceRoot(meshFilter);
-					var objectOverrides = UnityEditor.PrefabUtility.GetObjectOverrides(instanceRoot);
-
-					foreach (UnityEditor.SceneManagement.ObjectOverride objectOverride in objectOverrides) {
-						if (objectOverride.instanceObject == meshFilter) {
-							objectOverride.Revert(UnityEditor.InteractionMode.AutomatedAction);
-							break;
+					if (instanceRoot != null) {
+						var objectOverrides = UnityEditor.PrefabUtility.GetObjectOverrides(instanceRoot);
+						foreach (UnityEditor.SceneManagement.ObjectOverride objectOverride in objectOverrides) {
+							if (objectOverride.instanceObject == meshFilter) {
+								objectOverride.Revert(UnityEditor.InteractionMode.AutomatedAction);
+								break;
+							}
 						}
 						}
 					}
 					}
 				}
 				}