Merge pull request #15 from Unity-Technologies/UNI-20478-fix-material-assignment-bug

UNI-20478 fix material assignment bug

Author: inwoods

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -261,6 +261,7 @@ public FbxSurfaceMaterial ExportMaterial (Material unityMaterial, FbxScene fbxSc
 
                 var materialName = unityMaterial ? unityMaterial.name : "DefaultMaterial";
                 if (MaterialMap.ContainsKey (materialName)) {
+                    AssignLayerElementMaterial (fbxMesh);
                     return MaterialMap [materialName];
                 }
 
@@ -292,6 +293,14 @@ public FbxSurfaceMaterial ExportMaterial (Material unityMaterial, FbxScene fbxSc
                     ExportTexture (unityMaterial, "_SpecGlosMap", fbxMaterial, FbxSurfaceMaterial.sSpecular);
                 }
 
+                AssignLayerElementMaterial (fbxMesh);
+
+                MaterialMap.Add (materialName, fbxMaterial);
+                return fbxMaterial;
+            }
+
+            private void AssignLayerElementMaterial(FbxMesh fbxMesh)
+            {
                 // Add FbxLayerElementMaterial to layer 0 of the node
                 FbxLayer fbxLayer = fbxMesh.GetLayer (0 /* default layer */);
                 if (fbxLayer == null) {
@@ -300,7 +309,6 @@ public FbxSurfaceMaterial ExportMaterial (Material unityMaterial, FbxScene fbxSc
                 }
 
                 using (var fbxLayerElement = FbxLayerElementMaterial.Create (fbxMesh, "Material")) {
-
                     // Using all same means that the entire mesh uses the same material
                     fbxLayerElement.SetMappingMode (FbxLayerElement.EMappingMode.eAllSame);
                     fbxLayerElement.SetReferenceMode (FbxLayerElement.EReferenceMode.eIndexToDirect);
@@ -311,9 +319,6 @@ public FbxSurfaceMaterial ExportMaterial (Material unityMaterial, FbxScene fbxSc
                     fbxElementArray.Add (0);
                     fbxLayer.SetMaterials (fbxLayerElement);
                 }
-
-                MaterialMap.Add (materialName, fbxMaterial);
-                return fbxMaterial;
             }
 
             /// <summary>