Merge branch 'develop' into feature/new_publisher_core

openpype/lib/applications.py

@@ -1353,23 +1353,23 @@ def _prepare_last_workfile(data, workdir, workfile_template_key):
     )
 
     # Last workfile path
-    last_workfile_path = ""
-    extensions = avalon.api.HOST_WORKFILE_EXTENSIONS.get(
-        app.host_name
-    )
-    if extensions:
-        anatomy = data["anatomy"]
-        # Find last workfile
-        file_template = anatomy.templates[workfile_template_key]["file"]
-        workdir_data.update({
-            "version": 1,
-            "user": get_openpype_username(),
-            "ext": extensions[0]
-        })
+    last_workfile_path = data.get("last_workfile_path") or ""
+    if not last_workfile_path:
+        extensions = avalon.api.HOST_WORKFILE_EXTENSIONS.get(app.host_name)
 
-        last_workfile_path = avalon.api.last_workfile(
-            workdir, file_template, workdir_data, extensions, True
-        )
+        if extensions:
+            anatomy = data["anatomy"]
+            # Find last workfile
+            file_template = anatomy.templates["work"]["file"]
+            workdir_data.update({
+                "version": 1,
+                "user": get_openpype_username(),
+                "ext": extensions[0]
+            })
+
+            last_workfile_path = avalon.api.last_workfile(
+                workdir, file_template, workdir_data, extensions, True
+            )
 
     if os.path.exists(last_workfile_path):
         log.debug((

openpype/lib/plugin_tools.py

@@ -6,6 +6,7 @@ import logging
 import re
 import json
 import tempfile
+import distutils
 
 from .execute import run_subprocess
 from .profiles_filtering import filter_profiles
@@ -439,7 +440,7 @@ def oiio_supported():
     """
         Checks if oiiotool is configured for this platform.
 
-        Expects full path to executable.
+        Triggers simple subprocess, handles exception if fails.
 
         'should_decompress' will throw exception if configured,
         but not present or not working.
@@ -447,7 +448,10 @@ def oiio_supported():
             (bool)
     """
     oiio_path = get_oiio_tools_path()
-    if not oiio_path or not os.path.exists(oiio_path):
+    if oiio_path:
+        oiio_path = distutils.spawn.find_executable(oiio_path)
+
+    if not oiio_path:
         log.debug("OIIOTool is not configured or not present at {}".
                   format(oiio_path))
         return False