Merge pull request #220 from Unity-Technologies/UNI-31736-fix-export-setting-error-when-installing-new-package

inwoods · web-flow · commit f20c664c704c · 2017-11-24T12:56:14.000-05:00
UNI-31736 fix export settings error when updating package
diff --git a/Assets/FbxExporters/Editor/FbxExportSettings.cs b/Assets/FbxExporters/Editor/FbxExportSettings.cs
@@ -786,7 +786,8 @@ public static void SetRelativeSavePath(string newPath) {
         public static string GetIntegrationSavePath()
         {
             //If the save path gets messed up and ends up not being valid, just use the project folder as the default
-            if (string.IsNullOrEmpty(instance.IntegrationSavePath.Trim()) || !Directory.Exists(instance.IntegrationSavePath))
+            if (string.IsNullOrEmpty(instance.IntegrationSavePath) ||
+                !Directory.Exists(instance.IntegrationSavePath))
             {
                 //The project folder, above the asset folder
                 instance.IntegrationSavePath = DefaultIntegrationSavePath;

Original file line number	Diff line number	Diff line change
`@@ -786,7 +786,8 @@ public static void SetRelativeSavePath(string newPath) {`
`786`	`786`	`public static string GetIntegrationSavePath()`
`787`	`787`	`{`
`788`	`788`	`//If the save path gets messed up and ends up not being valid, just use the project folder as the default`
`789`		`- if (string.IsNullOrEmpty(instance.IntegrationSavePath.Trim()) \|\| !Directory.Exists(instance.IntegrationSavePath))`
	`789`	`+ if (string.IsNullOrEmpty(instance.IntegrationSavePath) \|\|`
	`790`	`+ !Directory.Exists(instance.IntegrationSavePath))`
`790`	`791`	`{`
`791`	`792`	`//The project folder, above the asset folder`
`792`	`793`	`instance.IntegrationSavePath = DefaultIntegrationSavePath;`