Merging with origin

pyblish · Jun 9, 2015 · 69a085b · 69a085b
2 parents 743c999 + d45e4a3
commit 69a085b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/pyblish/plugin.py b/pyblish/plugin.py
@@ -614,9 +614,6 @@ def current_host():
 
     executable = os.path.basename(sys.executable).lower()
 
-    if "python" in executable:
-        return "python"
-
     if "maya" in executable:
         return "maya"
 
@@ -626,9 +623,15 @@ def current_host():
     if "modo" in executable:
         return "modo"
 
+    if "houdini" in executable or "hou" in sys.modules:
+        return 'houdini'
+
     if "houdini" in executable:
         return "houdini"
 
+    if "python" in executable:
+        return "python"
+
     return "unknown"