merge

Author: inwoods

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -154,7 +154,7 @@ private static void WriteFile(string FileName, List<string> Lines )
             }
         }
 
-        public static bool InstallMaya(string version, bool verbose=true, bool commandsOnly=false)
+        public static bool InstallMaya(string version, bool verbose=true)
         {
             // check if package installed
             string moduleTemplatePath = GetModuleTemplatePath(version);
@@ -165,10 +165,6 @@ public static bool InstallMaya(string version, bool verbose=true, bool commandsO
                 return false;
             }
 
-            // TODO: detect maya2017 installation
-
-            // TODO:  if not maya2017 installed warn user
-
             // check for {USER} modules folder
             string modulePath = GetModulePath(version);
 
@@ -248,43 +244,22 @@ public static bool InstallMaya(string version, bool verbose=true, bool commandsO
                     // TODO: print message package already installed else where
             }
 
-            if (commandsOnly)
-                throw new NotImplementedException();
-
-            // TODO: configure maya to auto-load plugin on next startup
-
             return true;
         }
 
         public static void InstallMaya2017()
         {
             const bool verbose = true;
-            const bool commandsOnly = false;
             const string version = Integrations.MAYA_VERSION;
 
             Debug.Log(string.Format("Installing Maya {0} Integration", version));
 
-            if (InstallMaya (version, verbose, commandsOnly)) {
+            if (InstallMaya (version, verbose)) {
                 if (verbose) Debug.Log (string.Format ("Completed installation of Maya {0} Integration.", version));
             } else {
                 if (verbose) Debug.Log (string.Format ("Failed to install Maya {0} Integration.", version));
             }
         }
-
-        public static void InstallMaya2017CommandsOnly ()
-        {
-            const bool verbose = true;
-            const bool commandsOnly = true;
-            const string version = Integrations.MAYA_VERSION;
-
-            Debug.Log (string.Format ("Installing Maya {0} Integration (Commands Only).", version));
-
-            if (InstallMaya (version, verbose, commandsOnly)) {
-                if (verbose) Debug.Log (string.Format ("Completed installation of Maya {0} Integration (Commands Only).", version));
-            } else {
-                if (verbose) Debug.Log (string.Format ("Failed to install Maya {0} Integration (Commands Only).", version));
-            }
-        }
     }
 
     namespace Editors
@@ -296,7 +271,7 @@ class IntegrationsUI
             [MenuItem (MenuItemName, false, 0)]
             public static void OnMenuItem ()
             {
-            	if (Integrations.InstallMaya(Integrations.MAYA_VERSION, true, false))
+            	if (Integrations.InstallMaya(Integrations.MAYA_VERSION))
             	{
                     string title = string.Format("Completed installation of Maya {0} Integration.", Integrations.MAYA_VERSION);
                     string commands = string.Format("optionVar -stringValue \"UnityProject\" \"{0}\"; loadPlugin unityOneClickPlugin; pluginInfo -edit -autoload true unityOneClickPlugin;",Integrations.GetProjectPath());

Assets/Integrations/Autodesk/maya2017/plug-ins/unityOneClickPlugin.py

@@ -18,11 +18,13 @@
 import sys
 
 import maya.OpenMayaMPx as OpenMayaMPx
+import maya.cmds
 
 from unityOneClick import (version, commands, ui, debug)
 
 kPluginInfo = { 'name': version.pluginName(), 'version': version.versionName(), 'vendor': version.vendorName() }
 kVerbose = True
+kHeadlessInstall = maya.cmds.optionVar( exists='UnityOneClick_Headless' )
 
 # initialize the script plug-in
 def initializePlugin(mobject):
@@ -32,7 +34,9 @@ def initializePlugin(mobject):
             sys.stdout.write('loading %s\n'%kPluginInfo['name'])
 
         commands.register(pluginFn)
-        ui.register(pluginFn)
+
+        if not kHeadlessInstall:
+            ui.register(pluginFn)
 
     except Exception as e:
         assert isinstance(sys.stderr.write, object)
@@ -46,7 +50,9 @@ def uninitializePlugin(mobject):
         if debug.EnableDebugMessages:
             sys.stdout.write('unloading %s\n'%kPluginInfo['name'])
 
-        ui.unregister(pluginFn)
+        if not kHeadlessInstall:
+            ui.unregister(pluginFn)
+
         commands.unregister(pluginFn)
 
     except: