Skip to content

Commit 7b951d1

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/UNI-27556-max-import-functionality' into UNI-27977-generalize-DCC-app-selection
# Conflicts: # Assets/FbxExporters/Editor/InstallIntegration.cs
2 parents 29c242f + b26709b commit 7b951d1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Assets/FbxExporters/Editor/InstallIntegration.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,11 @@ private static string GetInstallScript(){
477477
}
478478

479479
public static int InstallMaxPlugin(string maxExe){
480+
if (Application.platform != RuntimePlatform.WindowsEditor) {
481+
Debug.LogError ("The 3DsMax Unity plugin is Windows only, please try installing a Maya plugin instead");
482+
return -1;
483+
}
484+
480485
var installScript = GetInstallScript ();
481486

482487
int ExitCode = 0;
@@ -494,13 +499,8 @@ public static int InstallMaxPlugin(string maxExe){
494499
myProcess.StartInfo.CreateNoWindow = true;
495500
myProcess.StartInfo.UseShellExecute = false;
496501

497-
#if UNITY_EDITOR_OSX
498-
throw new NotImplementedException();
499-
#elif UNITY_EDITOR_LINUX
500-
throw new NotImplementedException();
501-
#else // UNITY_EDITOR_WINDOWS
502502
myProcess.StartInfo.Arguments = string.Format("-q -silent -mxs \"{0}\"", installScript);
503-
#endif
503+
504504
myProcess.EnableRaisingEvents = true;
505505
myProcess.Start();
506506
myProcess.WaitForExit();

0 commit comments

Comments
 (0)