Merge pull request #317 from Unity-Technologies/UNI-37065-export-instances-for-model-prefabs

inwoods · web-flow · commit e3167f6ad408 · 2018-02-28T11:28:45.000-05:00
UNI-37065 export model prefab instances as instances
diff --git a/Assets/FbxExporters/Editor/FbxExporter.cs b/Assets/FbxExporters/Editor/FbxExporter.cs
@@ -1243,7 +1243,8 @@ protected bool ExportInstance (GameObject unityGo, FbxNode fbxNode, FbxScene fbx
             {
                 PrefabType unityPrefabType = PrefabUtility.GetPrefabType(unityGo);
 
-                if (unityPrefabType != PrefabType.PrefabInstance) return false;
+                if (unityPrefabType != PrefabType.PrefabInstance &&
+                    unityPrefabType != PrefabType.ModelPrefabInstance) return false;
 
                 Object unityPrefabParent = PrefabUtility.GetPrefabParent (unityGo);
 

Original file line number	Diff line number	Diff line change
`@@ -1243,7 +1243,8 @@ protected bool ExportInstance (GameObject unityGo, FbxNode fbxNode, FbxScene fbx`
`1243`	`1243`	`{`
`1244`	`1244`	`PrefabType unityPrefabType = PrefabUtility.GetPrefabType(unityGo);`
`1245`	`1245`
`1246`		`- if (unityPrefabType != PrefabType.PrefabInstance) return false;`
	`1246`	`+ if (unityPrefabType != PrefabType.PrefabInstance &&`
	`1247`	`+ unityPrefabType != PrefabType.ModelPrefabInstance) return false;`
`1247`	`1248`
`1248`	`1249`	`Object unityPrefabParent = PrefabUtility.GetPrefabParent (unityGo);`
`1249`	`1250`