Merge pull request #31 from quadproduction/enhancement/198-enhancemen…

…t-toggle-extract-psd-for-layout-posing-export-tvpaint Enhancement/198 : enhancement toggle extract psd for layout posing export tvpaint
quadproduction · Jan 8, 2024 · 4ab9c5c · 4ab9c5c
2 parents 40c393d + a7f9af8
commit 4ab9c5c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/quad_pyblish_module/plugins/tvpaint/create/create_playblast.py b/quad_pyblish_module/plugins/tvpaint/create/create_playblast.py
@@ -54,7 +54,8 @@ def _create_new_instance(self):
             "variant": self.default_variant,
             "creator_attributes": {
                 "mark_for_review": self.mark_for_review,
-                "export_type": self.export_type
+                "export_type": self.export_type,
+                "extract_psd": self.extract_psd
             },
             "label": self._get_label(subset_name),
             "active": self.active_on_create

diff --git a/quad_pyblish_module/plugins/tvpaint/create/create_publish_layout.py b/quad_pyblish_module/plugins/tvpaint/create/create_publish_layout.py
@@ -31,6 +31,7 @@ def apply_settings(self, project_settings, system_settings):
         self.keep_layers_transparency = plugin_settings["keep_layers_transparency"]
         self.default_variant = plugin_settings["default_variant"]
         self.default_variants = plugin_settings["default_variants"]
+        self.extract_psd = plugin_settings["extract_psd"]
         self.enabled = plugin_settings.get("enabled", True)
 
     def _create_new_instance(self):
@@ -54,7 +55,8 @@ def _create_new_instance(self):
             "variant": self.default_variant,
             "creator_attributes": {
                 "publish_sequence": self.publish_sequence,
-                "keep_layers_transparency": self.keep_layers_transparency
+                "keep_layers_transparency": self.keep_layers_transparency,
+                "extract_psd": self.extract_psd
             },
             "label": self._get_label(subset_name),
             "active": self.active_on_create
@@ -123,6 +125,11 @@ def get_instance_attr_defs(self):
                 label="Keep Layers Transparency",
                 default=self.keep_layers_transparency
             ),
+            BoolDef(
+                "extract_psd",
+                label="Extract PSD",
+                default=self.extract_psd
+            ),
             BoolDef(
                 "publish_sequence",
                 label="Review",

diff --git a/quad_pyblish_module/plugins/tvpaint/publish/extract_psd.py b/quad_pyblish_module/plugins/tvpaint/publish/extract_psd.py
@@ -13,16 +13,19 @@ class ExtractPsd(pyblish.api.InstancePlugin):
     order = pyblish.api.ExtractorOrder + 0.02
     label = "Extract PSD"
     hosts = ["tvpaint"]
-    families = ["renderLayer", "review"]
+    families = ["renderLayer", "review", "render"]
 
     project_name = os.environ['AVALON_PROJECT']
     project_settings = get_project_settings(project_name)
 
     enabled = project_settings['fix_custom_settings']['tvpaint']['publish'][
-        'ExtractPsd']['enabled']
+        'ExtractPsd'].get('enabled')
 
     def process(self, instance):
-        if not instance.data["creator_attributes"].get("extract_psd", self.enabled):
+        if not self.enabled:
+            return
+
+        if not instance.data["creator_attributes"].get("extract_psd", False):
             return
 
         george_script_lines = []

diff --git a/quad_pyblish_module/settings/defaults/project_settings.json b/quad_pyblish_module/settings/defaults/project_settings.json
@@ -30,6 +30,7 @@
                     "enabled": true,
                     "active_on_create": true,
                     "keep_layers_transparency": true,
+                    "extract_psd": false,
                     "default_variant": "Main",
                     "default_variants": []
                 }

diff --git a/quad_pyblish_module/settings/schemas/project_schemas/tvpaint.json b/quad_pyblish_module/settings/schemas/project_schemas/tvpaint.json
@@ -13,9 +13,10 @@
                 "children": [
                     {
                         "type": "dict",
+                        "collapsible": true,
                         "key": "ExtractPsd",
                         "label": "Extract PSD",
-                        "is_group": false,
+                        "is_group": true,
                         "checkbox_key": "enabled",
                         "children": [
                             {
@@ -152,6 +153,11 @@
                                 "key": "keep_layers_transparency",
                                 "label": "Keep Layers Transparency"
                             },
+                            {
+                                "type": "boolean",
+                                "key": "extract_psd",
+                                "label": "Extract PSD by default"
+                            },
                             {
                                 "type": "text",
                                 "key": "default_variant",