Merge branch 'develop' into fusion_output_format_validator

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -35,6 +35,7 @@ body:
       label: Version
       description: What version are you running? Look to OpenPype Tray
       options:
+        - 3.18.2-nightly.1
         - 3.18.1
         - 3.18.1-nightly.1
         - 3.18.0
@@ -134,7 +135,6 @@ body:
         - 3.15.4-nightly.3
         - 3.15.4-nightly.2
         - 3.15.4-nightly.1
-        - 3.15.3
     validations:
       required: true
   - type: dropdown

openpype/hosts/fusion/plugins/publish/extract_render_local.py

@@ -146,11 +146,15 @@ class FusionRenderLocal(
 
         staging_dir = os.path.dirname(path)
 
+        files = [os.path.basename(f) for f in expected_files]
+        if len(expected_files) == 1:
+            files = files[0]
+
         repre = {
             "name": ext[1:],
             "ext": ext[1:],
             "frameStart": f"%0{padding}d" % start,
-            "files": [os.path.basename(f) for f in expected_files],
+            "files": files,
             "stagingDir": staging_dir,
         }
 

openpype/hosts/photoshop/plugins/publish/extract_review.py

@@ -170,8 +170,7 @@ class ExtractReview(publish.Extractor):
         # Generate mov.
         mov_path = os.path.join(staging_dir, "review.mov")
         self.log.info(f"Generate mov review: {mov_path}")
-        args = [
-            ffmpeg_path,
+        args = ffmpeg_path + [
             "-y",
             "-i", source_files_pattern,
             "-vf", "pad=ceil(iw/2)*2:ceil(ih/2)*2",
@@ -224,6 +223,7 @@ class ExtractReview(publish.Extractor):
             "stagingDir": staging_dir,
             "tags": ["thumbnail", "delete"]
         })
+        instance.data["thumbnailPath"] = thumbnail_path
 
     def _check_and_resize(self, processed_img_names, source_files_pattern,
                           staging_dir):

openpype/plugins/publish/integrate_thumbnail_ayon.py

@@ -5,7 +5,21 @@
     pull into a scene.
 
     This one is used only as image describing content of published item and
-    shows up only in Loader in right column section.
+        shows up only in Loader or WebUI.
+
+    Instance must have 'published_representations' to
+        be able to integrate thumbnail.
+    Possible sources of thumbnail paths:
+    - instance.data["thumbnailPath"]
+    - representation with 'thumbnail' name in 'published_representations'
+    - context.data["thumbnailPath"]
+
+    Notes:
+        Issue with 'thumbnail' representation is that we most likely don't
+            want to integrate it as representation. Integrated representation
+            is polluting Loader and database without real usage. That's why
+            they usually have 'delete' tag to skip the integration.
+
 """
 
 import os

openpype/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.18.1"
+__version__ = "3.18.2-nightly.1"

server_addon/photoshop/server/settings/publish_plugins.py

@@ -29,7 +29,7 @@ class ColorCodeMappings(BaseSettingsModel):
     )
 
     layer_name_regex: list[str] = Field(
-        "",
+        default_factory=list,
         title="Layer name regex"
     )
 

server_addon/photoshop/server/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring addon version."""
-__version__ = "0.1.0"
+__version__ = "0.1.1"