fix merge issues

vkovec · vkovec · commit 78749d044785 · 2017-10-18T12:31:54.000-04:00
-extra curly bracket
-still referencing unityoneclick
diff --git a/Assets/FbxExporters/Editor/FbxExportSettings.cs b/Assets/FbxExporters/Editor/FbxExportSettings.cs
@@ -134,8 +134,6 @@ public override void OnInspectorGUI() {
                         } else {
                             foundDCCPath = TryFindDCC (dccPath, ext, ExportSettings.DCCType.Max);
                             foundDCC = ExportSettings.DCCType.Max;
-                    }
-
                         }
                     }
                     if (foundDCCPath == null) {
diff --git a/Assets/FbxExporters/Editor/InstallIntegration.cs b/Assets/FbxExporters/Editor/InstallIntegration.cs
@@ -70,7 +70,7 @@ class MayaIntegration : DCCIntegration
     {
         public override string DccDisplayName { get { return "Maya"; } }
 
-        private const string MODULE_FILENAME = "unityoneclick";
+        private const string MODULE_FILENAME = "UnityFbxForMaya";
         private const string PACKAGE_NAME = "FbxExporters";
         private const string VERSION_FILENAME = "README.txt";
         private const string VERSION_FIELD = "VERSION";

Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,6 @@ public override void OnInspectorGUI() {`
`134`	`134`	`} else {`
`135`	`135`	`foundDCCPath = TryFindDCC (dccPath, ext, ExportSettings.DCCType.Max);`
`136`	`136`	`foundDCC = ExportSettings.DCCType.Max;`
`137`		`- }`
`138`		`-`
`139`	`137`	`}`
`140`	`138`	`}`
`141`	`139`	`if (foundDCCPath == null) {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class MayaIntegration : DCCIntegration`
`70`	`70`	`{`
`71`	`71`	`public override string DccDisplayName { get { return "Maya"; } }`
`72`	`72`
`73`		`- private const string MODULE_FILENAME = "unityoneclick";`
	`73`	`+ private const string MODULE_FILENAME = "UnityFbxForMaya";`
`74`	`74`	`private const string PACKAGE_NAME = "FbxExporters";`
`75`	`75`	`private const string VERSION_FILENAME = "README.txt";`
`76`	`76`	`private const string VERSION_FIELD = "VERSION";`