Merge pull request #6232 from ynput/bugfix/OP-8338_hiero_Effect-Categ…

…ories-Backport Hiero: Add OP settings and convert in plugin - OP-8338
ynput · Mar 6, 2024 · 5f5bb7d · 5f5bb7d
2 parents 119320b + 669e0a7
commit 5f5bb7d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/openpype/hosts/hiero/plugins/publish/collect_clip_effects.py b/openpype/hosts/hiero/plugins/publish/collect_clip_effects.py
@@ -72,9 +72,13 @@ def process(self, instance):
 
         subset_split.insert(0, "effect")
 
-        effect_categories = {
-            x["name"]: x["effect_classes"] for x in self.effect_categories
-        }
+        # Need to convert to dict for AYON settings. This isinstance check can
+        # be removed in the future when OpenPype is no longer.
+        effect_categories = self.effect_categories
+        if isinstance(self.effect_categories, list):
+            effect_categories = {
+                x["name"]: x["effect_classes"] for x in self.effect_categories
+            }
 
         category_by_effect = {"": ""}
         for key, values in effect_categories.items():

diff --git a/openpype/settings/defaults/project_settings/hiero.json b/openpype/settings/defaults/project_settings/hiero.json
@@ -69,6 +69,10 @@
             "tags_addition": [
                 "review"
             ]
+        },
+        "CollectClipEffects": {
+            "enabled": true,
+            "effect_categories": {}
         }
     },
     "filters": {},

diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json b/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json
@@ -312,6 +312,31 @@
                             "label": "Tags addition"
                         }
                     ]
+                },
+                {
+                    "type": "dict",
+                    "collapsible": true,
+                    "checkbox_key": "enabled",
+                    "key": "CollectClipEffects",
+                    "label": "Collect Clip Effects",
+                    "is_group": true,
+                    "children": [
+                        {
+                            "type": "boolean",
+                            "key": "enabled",
+                            "label": "Enabled"
+                        },
+                        {
+                            "type": "dict-modifiable",
+                            "key": "effect_categories",
+                            "label": "Effect Categories",
+                            "object_type": {
+                                "type": "list",
+                                "key": "effects_classes",
+                                "object_type": "text"
+                            }
+                        }
+                    ]
                 }
             ]
         },