rename mergeVertices to weldVertices

Also remove NumVertices

Author: vkovec

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -205,7 +205,7 @@ public FbxSurfaceMaterial ExportMaterial (Material unityMaterial, FbxScene fbxSc
             /// Unconditionally export this mesh object to the file.
             /// We have decided; this mesh is definitely getting exported.
             /// </summary>
-            public void ExportMesh (MeshInfo meshInfo, FbxNode fbxNode, FbxScene fbxScene, bool mergeVertices = true)
+            public void ExportMesh (MeshInfo meshInfo, FbxNode fbxNode, FbxScene fbxScene, bool weldVertices = true)
             {
                 if (!meshInfo.IsValid)
                     return;
@@ -220,7 +220,7 @@ public void ExportMesh (MeshInfo meshInfo, FbxNode fbxNode, FbxScene fbxScene, b
                 Dictionary<Vector3, int> ControlPointToIndex = new Dictionary<Vector3, int> ();
 
                 int NumControlPoints = 0;
-                if (mergeVertices) {
+                if (weldVertices) {
                     for (int v = 0; v < meshInfo.VertexCount; v++) {
                         if (ControlPointToIndex.ContainsKey (meshInfo.Vertices [v])) {
                             continue;
@@ -229,7 +229,6 @@ public void ExportMesh (MeshInfo meshInfo, FbxNode fbxNode, FbxScene fbxScene, b
 
                         NumControlPoints++;
                     }
-                    NumVertices += NumControlPoints;
                     fbxMesh.InitControlPoints (NumControlPoints);
 
                     // copy control point data from Unity to FBX
@@ -242,7 +241,6 @@ public void ExportMesh (MeshInfo meshInfo, FbxNode fbxNode, FbxScene fbxScene, b
                     }
                 } else {
                     NumControlPoints = meshInfo.VertexCount;
-                    NumVertices += NumControlPoints;
                     fbxMesh.InitControlPoints (NumControlPoints);
 
                     for (int v = 0; v < NumControlPoints; v++)
@@ -275,7 +273,7 @@ meshInfo.Vertices [v].z
                         // properly export UVs, normals, binormals, etc.
                         unmergedTriangles [current] = tri;
 
-                        if (mergeVertices) {
+                        if (weldVertices) {
                             tri = ControlPointToIndex [meshInfo.Vertices [tri]];
                         }
                         fbxMesh.AddPolygon (tri);
@@ -722,11 +720,6 @@ private MeshInfo GetMeshInfo (GameObject gameObject, bool requireRenderer = true
             /// </summary>
             public int NumTriangles { private set; get; }
 
-            /// <summary>
-            /// Number of vertices
-            /// </summary>
-            public int NumVertices { private set; get; }
-
             /// <summary>
             /// Clean up this class on garbage collection
             /// </summary>