Merge branch 'develop' into bugfix/traypublisher-explicit-colorspace

openpype/hosts/aftereffects/plugins/publish/extract_local_render.py

@@ -60,8 +60,9 @@ class ExtractLocalRender(publish.Extractor):
             first_repre = not representations
             if instance.data["review"] and first_repre:
                 repre_data["tags"] = ["review"]
-                thumbnail_path = os.path.join(staging_dir, files[0])
-                instance.data["thumbnailSource"] = thumbnail_path
+                # TODO return back when Extract from source same as regular
+                # thumbnail_path = os.path.join(staging_dir, files[0])
+                # instance.data["thumbnailSource"] = thumbnail_path
 
             representations.append(repre_data)
 

openpype/hosts/houdini/plugins/publish/collect_chunk_size.py

@@ -14,18 +14,13 @@ class CollectChunkSize(pyblish.api.InstancePlugin,
     hosts = ["houdini"]
     targets = ["local", "remote"]
     label = "Collect Chunk Size"
-    chunkSize = 999999
+    chunk_size = 999999
 
     def process(self, instance):
         # need to get the chunk size info from the setting
         attr_values = self.get_attr_values_from_data(instance.data)
         instance.data["chunkSize"] = attr_values.get("chunkSize")
 
-    @classmethod
-    def apply_settings(cls, project_settings):
-        project_setting = project_settings["houdini"]["publish"]["CollectChunkSize"]         # noqa
-        cls.chunkSize = project_setting["chunk_size"]
-
     @classmethod
     def get_attribute_defs(cls):
         return [
@@ -33,7 +28,6 @@ class CollectChunkSize(pyblish.api.InstancePlugin,
                       minimum=1,
                       maximum=999999,
                       decimals=0,
-                      default=cls.chunkSize,
+                      default=cls.chunk_size,
                       label="Frame Per Task")
-
         ]

openpype/hosts/max/api/preview_animation.py

@@ -198,8 +198,8 @@ def _render_preview_animation_max_pre_2024(
             res_width, res_height, filename=filepath
         )
         dib = rt.gw.getViewportDib()
-        dib_width = rt.renderWidth
-        dib_height = rt.renderHeight
+        dib_width = float(dib.width)
+        dib_height = float(dib.height)
         # aspect ratio
         viewportRatio = dib_width / dib_height
         renderRatio = float(res_width / res_height)

openpype/hosts/max/plugins/publish/validate_resolution_setting.py

@@ -1,9 +1,12 @@
 import pyblish.api
+from pymxs import runtime as rt
 from openpype.pipeline import (
-    PublishValidationError,
     OptionalPyblishPluginMixin
 )
-from pymxs import runtime as rt
+from openpype.pipeline.publish import (
+    RepairAction,
+    PublishValidationError
+)
 from openpype.hosts.max.api.lib import reset_scene_resolution
 
 
@@ -16,6 +19,7 @@ class ValidateResolutionSetting(pyblish.api.InstancePlugin,
     hosts = ["max"]
     label = "Validate Resolution Setting"
     optional = True
+    actions = [RepairAction]
 
     def process(self, instance):
         if not self.is_active(instance.data):

openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py

@@ -257,8 +257,6 @@ class CollectHierarchyContext(pyblish.api.ContextPlugin):
             if 'shot' not in instance.data.get('family', ''):
                 continue
 
-            name = instance.data["asset"]
-
             # get handles
             handle_start = int(instance.data["handleStart"])
             handle_end = int(instance.data["handleEnd"])
@@ -286,6 +284,8 @@ class CollectHierarchyContext(pyblish.api.ContextPlugin):
             parents = instance.data.get('parents', [])
             self.log.debug(f"parents: {pformat(parents)}")
 
+            # Split by '/' for AYON where asset is a path
+            name = instance.data["asset"].split("/")[-1]
             actual = {name: in_info}
 
             for parent in reversed(parents):

openpype/hosts/substancepainter/api/lib.py

@@ -583,18 +583,9 @@ def prompt_new_file_with_mesh(mesh_filepath):
         file_dialog.setDirectory(os.path.dirname(mesh_filepath))
         url = QtCore.QUrl.fromLocalFile(os.path.basename(mesh_filepath))
         file_dialog.selectUrl(url)
-
-        # Give the explorer window time to refresh to the folder and select
-        # the file
-        while not file_dialog.selectedFiles():
-            app.processEvents(QtCore.QEventLoop.ExcludeUserInputEvents, 1000)
-        print(f"Selected: {file_dialog.selectedFiles()}")
-
-        # Set it again now we know the path is refreshed - without this
-        # accepting the dialog will often not trigger the correct filepath
-        file_dialog.setDirectory(os.path.dirname(mesh_filepath))
-        url = QtCore.QUrl.fromLocalFile(os.path.basename(mesh_filepath))
-        file_dialog.selectUrl(url)
+        # TODO: find a way to improve the process event to
+        # load more complicated mesh
+        app.processEvents(QtCore.QEventLoop.ExcludeUserInputEvents, 3000)
 
         file_dialog.done(file_dialog.Accepted)
         app.processEvents(QtCore.QEventLoop.AllEvents)
@@ -628,7 +619,12 @@ def prompt_new_file_with_mesh(mesh_filepath):
         mesh_filename_label = mesh_filename.findChild(QtWidgets.QLabel)
         if not mesh_filename_label.text():
             dialog.close()
-            raise RuntimeError(f"Failed to set mesh path: {mesh_filepath}")
+            substance_painter.logging.warning(
+                "Failed to set mesh path with the prompt dialog:"
+                f"{mesh_filepath}\n\n"
+                "Creating new project directly with the mesh path instead.")
+        else:
+            dialog.done(dialog.Accepted)
 
     new_action = _get_new_project_action()
     if not new_action:

openpype/hosts/substancepainter/plugins/load/load_mesh.py

@@ -44,14 +44,22 @@ class SubstanceLoadProjectMesh(load.LoaderPlugin):
         # Get user inputs
         import_cameras = data.get("import_cameras", True)
         preserve_strokes = data.get("preserve_strokes", True)
-
+        sp_settings = substance_painter.project.Settings(
+            import_cameras=import_cameras
+        )
         if not substance_painter.project.is_open():
             # Allow to 'initialize' a new project
             path = self.filepath_from_context(context)
+            # TODO: improve the prompt dialog function to not
+            # only works for simple polygon scene
             result = prompt_new_file_with_mesh(mesh_filepath=path)
             if not result:
-                self.log.info("User cancelled new project prompt.")
-                return
+                self.log.info("User cancelled new project prompt."
+                              "Creating new project directly from"
+                              " Substance Painter API Instead.")
+                settings = substance_painter.project.create(
+                    mesh_file_path=path, settings=sp_settings
+                )
 
         else:
             # Reload the mesh

openpype/hosts/traypublisher/plugins/create/create_editorial.py

@@ -663,7 +663,7 @@ or updating already created. Publishing will create OTIO file.
         variant_name = instance_data["variant"]
 
         # basic unique asset name
-        clip_name = os.path.splitext(otio_clip.name)[0].lower()
+        clip_name = os.path.splitext(otio_clip.name)[0]
         project_doc = get_project(self.project_name)
 
         shot_name, shot_metadata = self._shot_metadata_solver.generate_data(

openpype/hosts/traypublisher/plugins/publish/collect_shot_instances.py

@@ -155,8 +155,6 @@ class CollectShotInstance(pyblish.api.InstancePlugin):
             else {}
         )
 
-        asset_name = instance.data["asset"]
-
         # get handles
         handle_start = int(instance.data["handleStart"])
         handle_end = int(instance.data["handleEnd"])
@@ -177,6 +175,8 @@ class CollectShotInstance(pyblish.api.InstancePlugin):
 
         parents = instance.data.get('parents', [])
 
+        # Split by '/' for AYON where asset is a path
+        asset_name = instance.data["asset"].split("/")[-1]
         actual = {asset_name: in_info}
 
         for parent in reversed(parents):