From 636ff4eee33043e0c91230f7bdcb7eed88b8342f Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Thu, 6 May 2021 23:35:47 +0200 Subject: [PATCH 1/3] thumbnail uses same preset as playblast --- openpype/hosts/maya/plugins/publish/extract_thumbnail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/publish/extract_thumbnail.py b/openpype/hosts/maya/plugins/publish/extract_thumbnail.py index 35d720726b..cf40104645 100644 --- a/openpype/hosts/maya/plugins/publish/extract_thumbnail.py +++ b/openpype/hosts/maya/plugins/publish/extract_thumbnail.py @@ -34,7 +34,7 @@ class ExtractThumbnail(openpype.api.Extractor): capture_preset = "" capture_preset = ( - instance.context.data["project_settings"]['maya']['publish']['ExtractPlayblast'] + instance.context.data["project_settings"]['maya']['publish']['ExtractPlayblast']['capture_preset'] ) try: From 8b227929eea11aeda20d8f5d42cfc4e0acb5418d Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Thu, 6 May 2021 23:36:05 +0200 Subject: [PATCH 2/3] integrate hero is configurable --- ..._master_version.py => integrate_hero_version.py} | 0 .../settings/defaults/project_settings/global.json | 13 ++++++++++++- .../schemas/schema_global_publish.json | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) rename openpype/plugins/publish/{integrate_master_version.py => integrate_hero_version.py} (100%) diff --git a/openpype/plugins/publish/integrate_master_version.py b/openpype/plugins/publish/integrate_hero_version.py similarity index 100% rename from openpype/plugins/publish/integrate_master_version.py rename to openpype/plugins/publish/integrate_hero_version.py diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index c9b61e0375..58a782f6f4 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -1,7 +1,18 @@ { "publish": { "IntegrateHeroVersion": { - "enabled": true + "enabled": true, + "optional": true, + "families": [ + "model", + "rig", + "look", + "pointcache", + "animation", + "setdress", + "layout", + "mayaAscii" + ] }, "ExtractJpegEXR": { "enabled": true, diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json index 8b0828be23..f1b6e7718f 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json @@ -16,6 +16,17 @@ "type": "boolean", "key": "enabled", "label": "Enabled" + }, + { + "type": "boolean", + "key": "optional", + "label": "Optional" + }, + { + "key": "families", + "label": "Families", + "type": "list", + "object_type": "text" } ] }, From 01eab50c023b3cf523dc37ebf80d43e976fe867a Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Fri, 7 May 2021 11:07:58 +0200 Subject: [PATCH 3/3] limit delete versions to library --- openpype/hosts/maya/plugins/load/load_reference.py | 1 - openpype/plugins/load/delete_old_versions.py | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/hosts/maya/plugins/load/load_reference.py b/openpype/hosts/maya/plugins/load/load_reference.py index 61e0290296..37a2b145d4 100644 --- a/openpype/hosts/maya/plugins/load/load_reference.py +++ b/openpype/hosts/maya/plugins/load/load_reference.py @@ -19,7 +19,6 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader): "rig", "camerarig"] representations = ["ma", "abc", "fbx", "mb"] - tool_names = ["loader"] label = "Reference" order = -10 diff --git a/openpype/plugins/load/delete_old_versions.py b/openpype/plugins/load/delete_old_versions.py index 8e3999e9c4..0a8df90463 100644 --- a/openpype/plugins/load/delete_old_versions.py +++ b/openpype/plugins/load/delete_old_versions.py @@ -18,6 +18,7 @@ class DeleteOldVersions(api.Loader): """Deletes specific number of old version""" representations = ["*"] families = ["*"] + tool_names = ["library_loader"] label = "Delete Old Versions" order = 35 @@ -425,6 +426,7 @@ class CalculateOldVersions(DeleteOldVersions): """Calculate file size of old versions""" label = "Calculate Old Versions" order = 30 + tool_names = ["library_loader"] options = [ qargparse.Integer(