fix merge

Author: inwoods

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -1721,6 +1721,9 @@ protected int ExportNodes(
                 FbxNode fbxNode = FbxNode.Create (fbxScene, GetUniqueName (unityGo.name));
                 MapUnityObjectToFbxNode [unityGo] = fbxNode;
 
+                if (Verbose)
+                    Debug.Log (string.Format ("exporting {0}", fbxNode.GetName ()));
+
                 numObjectsExported++;
                 if (EditorUtility.DisplayCancelableProgressBar (
                     ProgressBarTitle,
@@ -1739,21 +1742,13 @@ protected int ExportNodes(
 
                 ExportTransform (unityGo.transform, fbxNode, newCenter, exportType);
 
-                MapUnityObjectToFbxNode.Add (unityGo, fbxNode);
-
-                if (Verbose)
-                    Debug.Log (string.Format ("exporting {0}", fbxNode.GetName ()));
-
                 fbxNodeParent.AddChild (fbxNode);
 
                 // now  unityGo  through our children and recurse
                 foreach (Transform childT in  unityGo.transform) {
                     numObjectsExported = ExportNodes (childT.gameObject, fbxScene, fbxNode, numObjectsExported, objectCount, newCenter);
                 }
 
-                // now export animation (after hierarchy has been exported)
-                ExportAnimation (unityGo, fbxScene);
-
                 return numObjectsExported;
             }
 
@@ -1795,6 +1790,9 @@ protected bool ExportComponents(FbxScene fbxScene)
                         ExportLight (unityGo, fbxScene, fbxNode);
                     }
 
+                    // now (try) export animation
+    				ExportAnimation (unityGo, fbxScene);
+
                 }
                 return true;
             }
@@ -2580,12 +2578,6 @@ bool ExportMesh (GameObject gameObject, FbxNode fbxNode)
                 return false;
             }
 
-            /// <summary>
-            /// keep a map between GameObject and FbxNode for quick lookup when we export
-            /// animation.
-            /// </summary>
-            Dictionary<GameObject, FbxNode> MapUnityObjectToFbxNode = new Dictionary<GameObject, FbxNode> ();
-
             /// <summary>
             /// Number of nodes exported including siblings and decendents
             /// </summary>

Assets/FbxExporters/Editor/UnitTests/ModelExporterTest.cs

@@ -507,6 +507,7 @@ private void CompareMeshComponentAttributes(Mesh mesh, Mesh fbxMesh)
             Assert.AreEqual (mesh.tangents, fbxMesh.tangents);
         }
 
+        [Test]
         public void TestSkinnedMeshExport(){
             // for now use this cowboy taken from the asset store as the test file
             // TODO: find a better/simpler test file
@@ -574,7 +575,7 @@ public void TestSkinnedMeshExport(){
 
                 for (int j = 0; j < 4; j++) {
                     for (int k = 0; k < 4; k++) {
-                        Assert.AreEqual (origBp.GetColumn (j)[k], expBp.GetColumn (j)[k], 0.001);
+                        Assert.That (origBp.GetColumn (j)[k], Is.EqualTo(expBp.GetColumn (j)[k]).Within(0.001f), string.Format("bind pose doesn't match {0},{1}", j, k));
                     }
                 }
             }