remove ConvertToValidFilename from ConvertToModel

using the one in FbxExporter instead

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -21,9 +21,6 @@ public class ConvertToModel : System.IDisposable
             const string MenuItemName1 = "Assets/Convert To Model";
             const string MenuItemName2 = "GameObject/Convert To Model";
 
-            const string RegexCharStart = "[";
-            const string RegexCharEnd = "]";
-
             /// <summary>
             /// Clean up this class on garbage collection
             /// </summary>
@@ -140,12 +137,6 @@ private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)
                 return result;
             }
 
-            private static string ConvertToValidFilename(string filename)
-            {
-                return System.Text.RegularExpressions.Regex.Replace (filename, 
-                    RegexCharStart + new string(Path.GetInvalidFileNameChars()) + RegexCharEnd, "_");
-            }
-
             private static void SetupImportedGameObject(GameObject orig, GameObject imported)
             {
                 Transform importedTransform = imported.transform;

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -38,8 +38,11 @@ public class ModelExporter : System.IDisposable
 
             const char MayaNamespaceSeparator = ':';
 
-            // replace invalid chars with this string
-            const string InvalidCharReplacement = "_";
+            // replace invalid chars with this one
+            const char InvalidCharReplacement = '_';
+
+            const string RegexCharStart = "[";
+            const string RegexCharEnd = "]";
 
             /// <summary>
             /// Create instance of example
@@ -244,7 +247,7 @@ public void ExportTexture (Material unityMaterial, string unityPropName,
             /// <summary>
             /// Get the color of a material, or grey if we can't find it.
             /// </summary>
-            public FbxDouble3? GetMaterialColor (Material unityMaterial, string unityPropName, float defaultValue = 1)
+            public FbxDouble3 GetMaterialColor (Material unityMaterial, string unityPropName, float defaultValue = 1)
             {
                 if (!unityMaterial) {
                     return new FbxDouble3(defaultValue);
@@ -1079,7 +1082,10 @@ private static string ConvertToMayaCompatibleName(string name)
 
             public static string ConvertToValidFilename(string filename)
             {
-                return System.Text.RegularExpressions.Regex.Replace (filename, "[" + new string(Path.GetInvalidFileNameChars()) + "]", InvalidCharReplacement);
+                return System.Text.RegularExpressions.Regex.Replace (filename, 
+                    RegexCharStart + new string(Path.GetInvalidFileNameChars()) + RegexCharEnd,
+                    InvalidCharReplacement.ToString()
+                );
             }
         }
     }