From dbd27983e4e36e0205d090f4b115d6f8c06bdd72 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Tue, 25 Jun 2024 16:07:07 +0800 Subject: [PATCH 1/2] make sure the extract thumbnail has higher priority than the screenshot source thumbanil --- .../max/client/ayon_max/plugins/publish/extract_thumbnail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_addon/max/client/ayon_max/plugins/publish/extract_thumbnail.py b/server_addon/max/client/ayon_max/plugins/publish/extract_thumbnail.py index 183e381be2..ce481ef88c 100644 --- a/server_addon/max/client/ayon_max/plugins/publish/extract_thumbnail.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_thumbnail.py @@ -8,7 +8,7 @@ class ExtractThumbnail(publish.Extractor): """Extract Thumbnail for Review """ - order = pyblish.api.ExtractorOrder + order = pyblish.api.ExtractorOrder - 0.45 label = "Extract Thumbnail" hosts = ["max"] families = ["review"] From a4335f7f4b67d74363580f8663947c7dc71d0b32 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Tue, 25 Jun 2024 17:42:06 +0800 Subject: [PATCH 2/2] check if there is thumbnail source in the instance.data --- .../client/ayon_max/plugins/publish/extract_thumbnail.py | 6 ++++-- .../client/ayon_maya/plugins/publish/extract_thumbnail.py | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server_addon/max/client/ayon_max/plugins/publish/extract_thumbnail.py b/server_addon/max/client/ayon_max/plugins/publish/extract_thumbnail.py index ce481ef88c..0316b998c9 100644 --- a/server_addon/max/client/ayon_max/plugins/publish/extract_thumbnail.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_thumbnail.py @@ -1,5 +1,4 @@ import os -import pyblish.api from ayon_core.pipeline import publish from ayon_max.api.preview_animation import render_preview_animation @@ -8,12 +7,15 @@ class ExtractThumbnail(publish.Extractor): """Extract Thumbnail for Review """ - order = pyblish.api.ExtractorOrder - 0.45 label = "Extract Thumbnail" hosts = ["max"] families = ["review"] def process(self, instance): + if instance.data.get("thumbnailSource"): + self.log.debug("Thumbnail source found, skipping...") + return + ext = instance.data.get("imageFormat") frame = int(instance.data["frameStart"]) staging_dir = self.staging_dir(instance) diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py index 4357a9b5c0..c693b0e8c3 100644 --- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py @@ -2,7 +2,6 @@ import glob import os import tempfile -import pyblish.api from ayon_maya.api import lib from ayon_maya.api import plugin @@ -14,13 +13,14 @@ class ExtractThumbnail(plugin.MayaExtractorPlugin): capture. """ - order = pyblish.api.ExtractorOrder - 0.45 label = "Thumbnail" families = ["review"] def process(self, instance): self.log.debug("Extracting thumbnail..") - + if instance.data.get("thumbnailSource"): + self.log.debug("Thumbnail source found, skipping...") + return camera = instance.data["review_camera"] task_data = instance.data["anatomyData"].get("task", {})