Skip to content

Commit 8a5197a

Browse files
author
AJubrey
committed
[FIXED] some bad comments
[FIXED?] an issue where if you had a settings file already the field defaulted to blank, I think that should not happen anymore.
1 parent 451e495 commit 8a5197a

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

Assets/FbxExporters/Editor/FbxExportSettings.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public override void OnInspectorGUI() {
9090
GUILayout.BeginHorizontal ();
9191
GUILayout.Label (new GUIContent (
9292
"Integrations Path:",
93-
"Relative path for saving 3D application integrations."), GUILayout.Width(LabelWidth - 3));
93+
"Absolute path for saving 3D application integrations."), GUILayout.Width(LabelWidth - 3));
9494

9595
var IntegrationsPathLabel = ExportSettings.GetIntegrationSavePath();
9696
EditorGUILayout.SelectableLabel(IntegrationsPathLabel,
@@ -113,7 +113,6 @@ public override void OnInspectorGUI() {
113113
"Select Integrations Path", initialPath, null
114114
);
115115

116-
// Unless the user canceled, make sure they chose something in the Assets folder.
117116
if (!string.IsNullOrEmpty(fullPath))
118117
{
119118
ExportSettings.SetIntegrationSavePath(fullPath);
@@ -732,6 +731,10 @@ public static void SetRelativeSavePath(string newPath) {
732731

733732
public static string GetIntegrationSavePath()
734733
{
734+
if (!instance.IntegrationSavePath.Contains("/"))
735+
{
736+
Directory.GetCurrentDirectory().ToString();
737+
}
735738
return instance.IntegrationSavePath;
736739
}
737740

Assets/FbxExporters/Editor/InstallIntegration.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -636,13 +636,6 @@ private static void ShowSuccessDialog(string dcc, int exitCode){
636636
UnityEditor.EditorUtility.DisplayDialog (title, message, "Ok");
637637
}
638638

639-
private static string DefaultIntegrationSavePath
640-
{
641-
get{
642-
return Application.dataPath;
643-
}
644-
}
645-
646639
public static void InstallDCCIntegration ()
647640
{
648641
var dccExe = GetDCCExe ();
@@ -674,7 +667,7 @@ private static bool GetIntegrationFolder(DCCIntegration dcc){
674667
if (System.IO.File.Exists (zipPath)) {
675668
return DecompressIntegrationZipFile (zipPath, dcc);
676669
}
677-
dcc.SetIntegrationFolderPath (DefaultIntegrationSavePath);
670+
dcc.SetIntegrationFolderPath (EditorTools.ExportSettings.GetIntegrationSavePath());
678671
return true;
679672
}
680673

0 commit comments

Comments
 (0)