Fix path check.

natalia-wh · natalia-wh · commit 216ff5a27bf9 · 2020-08-12T16:50:23.000-04:00
diff --git a/com.unity.formats.fbx/Editor/ExportModelEditorWindow.cs b/com.unity.formats.fbx/Editor/ExportModelEditorWindow.cs
@@ -376,7 +376,7 @@ protected void OnGUI ()
             ExportSettings.instance.SelectedFbxPath = EditorGUILayout.Popup (ExportSettings.instance.SelectedFbxPath, pathLabels, GUILayout.MinWidth(SelectableLabelMinWidth));
 
             // Set export setting for exporting outside the project on choosing a path
-            if (string.IsNullOrEmpty(ExportSettings.ConvertToAssetRelativePath(pathLabels[ExportSettings.instance.SelectedFbxPath])))
+            if (!pathLabels[ExportSettings.instance.SelectedFbxPath].Substring(0, 6).Equals("Assets"))
             {
                 ExportSettings.instance.ExportOutsideProject = true;
             }
@@ -406,6 +406,7 @@ protected void OnGUI ()
                     // We're exporting outside Assets folder, so store the absolute path
                     else if (string.IsNullOrEmpty(relativePath))
                     {
+                        ExportSettings.instance.ExportOutsideProject = true;
                         ExportSettings.AddFbxSavePath(fullPath);
                     }
                     // Store the relative path to the Assets folder

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ protected void OnGUI ()`
`376`	`376`	`ExportSettings.instance.SelectedFbxPath = EditorGUILayout.Popup (ExportSettings.instance.SelectedFbxPath, pathLabels, GUILayout.MinWidth(SelectableLabelMinWidth));`
`377`	`377`
`378`	`378`	`// Set export setting for exporting outside the project on choosing a path`
`379`		`- if (string.IsNullOrEmpty(ExportSettings.ConvertToAssetRelativePath(pathLabels[ExportSettings.instance.SelectedFbxPath])))`
	`379`	`+ if (!pathLabels[ExportSettings.instance.SelectedFbxPath].Substring(0, 6).Equals("Assets"))`
`380`	`380`	`{`
`381`	`381`	`ExportSettings.instance.ExportOutsideProject = true;`
`382`	`382`	`}`
`@@ -406,6 +406,7 @@ protected void OnGUI ()`
`406`	`406`	`// We're exporting outside Assets folder, so store the absolute path`
`407`	`407`	`else if (string.IsNullOrEmpty(relativePath))`
`408`	`408`	`{`
	`409`	`+ ExportSettings.instance.ExportOutsideProject = true;`
`409`	`410`	`ExportSettings.AddFbxSavePath(fullPath);`
`410`	`411`	`}`
`411`	`412`	`// Store the relative path to the Assets folder`