From 51196290b2419d37b3c71ead5501d918a47c9211 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Wed, 15 Feb 2023 18:46:48 +0100 Subject: [PATCH] apply settings in creators --- .../tvpaint/plugins/create/create_render.py | 27 +++++++++++++++++++ .../tvpaint/plugins/create/create_review.py | 5 +++- .../tvpaint/plugins/create/create_workfile.py | 7 ++++- .../defaults/project_settings/tvpaint.json | 2 +- .../schema_project_tvpaint.json | 2 +- 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/openpype/hosts/tvpaint/plugins/create/create_render.py b/openpype/hosts/tvpaint/plugins/create/create_render.py index 255f2605aa..fa724fabe2 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_render.py +++ b/openpype/hosts/tvpaint/plugins/create/create_render.py @@ -116,6 +116,15 @@ class CreateRenderlayer(TVPaintCreator): # - Mark by default instance for review mark_for_review = True + def apply_settings(self, project_settings, system_settings): + plugin_settings = ( + project_settings["tvpain"]["create"]["create_render_layer"] + ) + self.default_variant = plugin_settings["default_variant"] + self.default_variants = plugin_settings["default_variants"] + self.default_pass_name = plugin_settings["default_pass_name"] + self.mark_for_review = plugin_settings["mark_for_review"] + def get_dynamic_data( self, variant, task_name, asset_doc, project_name, host_name, instance ): @@ -321,6 +330,14 @@ class CreateRenderPass(TVPaintCreator): # Settings mark_for_review = True + def apply_settings(self, project_settings, system_settings): + plugin_settings = ( + project_settings["tvpain"]["create"]["create_render_pass"] + ) + self.default_variant = plugin_settings["default_variant"] + self.default_variants = plugin_settings["default_variants"] + self.mark_for_review = plugin_settings["mark_for_review"] + def collect_instances(self): instances_by_identifier = self._cache_and_get_instances() render_layers = { @@ -547,6 +564,16 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator): mark_for_review = True active_on_create = False + def apply_settings(self, project_settings, system_settings): + plugin_settings = ( + project_settings["tvpain"]["create"]["create_render_scene"] + ) + self.default_variant = plugin_settings["default_variant"] + self.default_variants = plugin_settings["default_variants"] + self.mark_for_review = plugin_settings["mark_for_review"] + self.active_on_create = plugin_settings["active_on_create"] + self.default_pass_name = plugin_settings["default_pass_name"] + def get_dynamic_data(self, variant, *args, **kwargs): dynamic_data = super().get_dynamic_data(variant, *args, **kwargs) dynamic_data["renderpass"] = "{renderpass}" diff --git a/openpype/hosts/tvpaint/plugins/create/create_review.py b/openpype/hosts/tvpaint/plugins/create/create_review.py index 1172b53032..a0af10f3be 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_review.py +++ b/openpype/hosts/tvpaint/plugins/create/create_review.py @@ -9,7 +9,10 @@ class TVPaintReviewCreator(TVPaintAutoCreator): label = "Review" icon = "ei.video" - default_variant = "Main" + def apply_settings(self, project_settings, system_settings): + plugin_settings = project_settings["tvpain"]["create"]["create_review"] + self.default_variant = plugin_settings["default_variant"] + self.default_variants = plugin_settings["default_variants"] def create(self): existing_instance = None diff --git a/openpype/hosts/tvpaint/plugins/create/create_workfile.py b/openpype/hosts/tvpaint/plugins/create/create_workfile.py index 152d29cf6f..e247072e3b 100644 --- a/openpype/hosts/tvpaint/plugins/create/create_workfile.py +++ b/openpype/hosts/tvpaint/plugins/create/create_workfile.py @@ -11,7 +11,12 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator): # Settings active_on_create = True - default_variant = "Main" + + def apply_settings(self, project_settings, system_settings): + plugin_settings = project_settings["tvpain"]["create"]["create_workfile"] + self.default_variant = plugin_settings["default_variant"] + self.default_variants = plugin_settings["default_variants"] + self.active_on_create = plugin_settings["active_on_create"] def create(self): existing_instance = None diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json index 0441b2da00..74a5af403c 100644 --- a/openpype/settings/defaults/project_settings/tvpaint.json +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -32,7 +32,7 @@ }, "create_render_layer": { "mark_for_review": true, - "render_pass_name": "beauty", + "default_pass_name": "beauty", "default_variant": "Main", "default_variants": [] }, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json index 10f4b538f7..d09c666d50 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json @@ -151,7 +151,7 @@ }, { "type": "text", - "key": "render_pass_name", + "key": "default_pass_name", "label": "Default beauty pass" }, {