diff --git a/openpype/hosts/nuke/plugins/create/create_write_prerender.py b/openpype/hosts/nuke/plugins/create/create_write_prerender.py index 3285e5f92d..761439fdb2 100644 --- a/openpype/hosts/nuke/plugins/create/create_write_prerender.py +++ b/openpype/hosts/nuke/plugins/create/create_write_prerender.py @@ -98,13 +98,13 @@ class CreateWritePrerender(plugin.OpenPypeCreator): "/{subset}.{frame}.{ext}")}) self.log.info("write_data: {}".format(write_data)) - + reviewable = self.presets.get("reviewable") write_node = create_write_node( self.data["subset"], write_data, input=selected_node, prenodes=[], - review=False, + review=reviewable, linked_knobs=["channels", "___", "first", "last", "use_limit"]) # relinking to collected connections diff --git a/openpype/modules/default_modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/default_modules/ftrack/plugins/publish/integrate_ftrack_instances.py index 8399e19184..cff7cd32cb 100644 --- a/openpype/modules/default_modules/ftrack/plugins/publish/integrate_ftrack_instances.py +++ b/openpype/modules/default_modules/ftrack/plugins/publish/integrate_ftrack_instances.py @@ -23,6 +23,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin): "setdress": "setdress", "pointcache": "cache", "render": "render", + "prerender": "render", "render2d": "render", "nukescript": "comp", "write": "render", @@ -51,6 +52,9 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin): if not asset_type and family_low in self.family_mapping: asset_type = self.family_mapping[family_low] + self.log.debug(self.family_mapping) + self.log.debug(family_low) + # Ignore this instance if neither "ftrackFamily" or a family mapping is # found. if not asset_type: diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json index 1474ad103d..00ce65705a 100644 --- a/openpype/settings/defaults/project_settings/ftrack.json +++ b/openpype/settings/defaults/project_settings/ftrack.json @@ -292,7 +292,8 @@ ], "families": [ "write", - "render" + "render", + "prerender" ], "task_types": [], "tasks": [], @@ -353,6 +354,7 @@ "setdress": "setdress", "pointcache": "cache", "render": "render", + "prerender": "render", "render2d": "render", "nukescript": "comp", "write": "render", diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json index c3e229b8e8..5a819e6904 100644 --- a/openpype/settings/defaults/project_settings/nuke.json +++ b/openpype/settings/defaults/project_settings/nuke.json @@ -32,7 +32,8 @@ "Fg01", "Branch01", "Part01" - ] + ], + "reviewable": false } }, "publish": { diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json b/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json index 22cb8a4ea3..9ab5fc65fb 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json @@ -131,6 +131,11 @@ "object_type": { "type": "text" } + }, + { + "type": "boolean", + "key": "reviewable", + "label": "Add reviewable toggle" } ] }