don't copy FbxPrefab when converting LinkedPrefab

vkovec · vkovec · commit 9f5a6695fd3b · 2019-04-04T15:36:42.000-04:00
diff --git a/com.unity.formats.fbx/Editor/ConvertToNestedPrefab.cs b/com.unity.formats.fbx/Editor/ConvertToNestedPrefab.cs
@@ -718,8 +718,8 @@ internal static void CopyComponents(GameObject to, GameObject from, Dictionary<s
                     continue;
                 }
 
-                // ignore MeshFilter
-                if (fromComponent is MeshFilter)
+                // ignore MeshFilter and FbxPrefab (when converting LinkedPrefabs)
+                if (fromComponent is MeshFilter || fromComponent is UnityEngine.Formats.Fbx.Exporter.FbxPrefab)
                 {
                     continue;
                 }

Original file line number	Diff line number	Diff line change
`@@ -718,8 +718,8 @@ internal static void CopyComponents(GameObject to, GameObject from, Dictionary<s`
`718`	`718`	`continue;`
`719`	`719`	`}`
`720`	`720`
`721`		`- // ignore MeshFilter`
`722`		`- if (fromComponent is MeshFilter)`
	`721`	`+ // ignore MeshFilter and FbxPrefab (when converting LinkedPrefabs)`
	`722`	`+ if (fromComponent is MeshFilter \|\| fromComponent is UnityEngine.Formats.Fbx.Exporter.FbxPrefab)`
`723`	`723`	`{`
`724`	`724`	`continue;`
`725`	`725`	`}`