From 8677fb60b81eeea076cc7c807c87eea100ca3c42 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 14 Apr 2021 17:07:29 +0200 Subject: [PATCH 1/5] change blender to 2.91 --- openpype/settings/defaults/project_anatomy/attributes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json index b3192fb04f..3ad6761331 100644 --- a/openpype/settings/defaults/project_anatomy/attributes.json +++ b/openpype/settings/defaults/project_anatomy/attributes.json @@ -16,7 +16,7 @@ "hiero/12-2", "resolve/16", "houdini/18-5", - "blender/2-90", + "blender/2-91", "harmony/20", "photoshop/2021", "aftereffects/2021", From f60ac7724ea4de76f1bb7f58b03ac88d3bbf3dfe Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 14 Apr 2021 17:07:48 +0200 Subject: [PATCH 2/5] add maya 2022 and nuke 13.0 for testing --- .../system_settings/applications.json | 145 +++++++++++++++++- 1 file changed, 140 insertions(+), 5 deletions(-) diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index 52ffb528f1..58a9818465 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -19,6 +19,25 @@ "OPENPYPE_LOG_NO_COLORS": "Yes" }, "variants": { + "2022": { + "executables": { + "windows": [ + "C:\\Program Files\\Autodesk\\Maya2022\\bin\\maya.exe" + ], + "darwin": [], + "linux": [ + "/usr/autodesk/maya2022/bin/maya" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "MAYA_VERSION": "2022" + } + }, "2020": { "executables": { "windows": [ @@ -75,6 +94,9 @@ "environment": { "MAYA_VERSION": "2018" } + }, + "__dynamic_keys_labels__": { + "2022": "2022 (Testing Only)" } } }, @@ -95,6 +117,23 @@ "LOGLEVEL": "DEBUG" }, "variants": { + "13-0": { + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.0v1/Nuke13.0" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, "12-2": { "executables": { "windows": [ @@ -164,7 +203,9 @@ "__dynamic_keys_labels__": { "12-2": "12.2", "12-0": "12.0", - "11-3": "11.3" + "11-3": "11.3", + "11-2": "11.2", + "13-0": "13.0 (Testing only)" } } }, @@ -185,6 +226,29 @@ "LOGLEVEL": "DEBUG" }, "variants": { + "13-0": { + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.0v1/Nuke13.0" + ] + }, + "arguments": { + "windows": [ + "--nukex" + ], + "darwin": [ + "--nukex" + ], + "linux": [ + "--nukex" + ] + }, + "environment": {} + }, "12-2": { "executables": { "windows": [ @@ -279,7 +343,8 @@ "12-2": "12.2", "12-0": "12.0", "11-3": "11.3", - "11-2": "11.2" + "11-2": "11.2", + "13-0": "13.0 (Testing only)" } } }, @@ -300,6 +365,29 @@ "LOGLEVEL": "DEBUG" }, "variants": { + "13-0": { + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.0v1/Nuke13.0" + ] + }, + "arguments": { + "windows": [ + "--studio" + ], + "darwin": [ + "--studio" + ], + "linux": [ + "--studio" + ] + }, + "environment": {} + }, "12-2": { "executables": { "windows": [ @@ -392,7 +480,8 @@ "12-2": "12.2", "12-0": "12.0", "11-3": "11.3", - "11-2": "11.2" + "11-2": "11.2", + "13-0": "13.0 (Testing only)" } } }, @@ -413,6 +502,29 @@ "LOGLEVEL": "DEBUG" }, "variants": { + "13-0": { + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.0v1/Nuke13.0" + ] + }, + "arguments": { + "windows": [ + "--hiero" + ], + "darwin": [ + "--hiero" + ], + "linux": [ + "--hiero" + ] + }, + "environment": {} + }, "12-2": { "executables": { "windows": [ @@ -507,7 +619,8 @@ "12-2": "12.2", "12-0": "12.0", "11-3": "11.3", - "11-2": "11.2" + "11-2": "11.2", + "13-0": "13.0 (Testing only)" } } }, @@ -760,9 +873,31 @@ }, "environment": {} }, + "2-91": { + "executables": { + "windows": [ + "C:\\Program Files\\Blender Foundation\\Blender 2.91\\blender.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [ + "--python-use-system-env" + ], + "darwin": [ + "--python-use-system-env" + ], + "linux": [ + "--python-use-system-env" + ] + }, + "environment": {} + }, "__dynamic_keys_labels__": { "2-83": "2.83", - "2-90": "2.90" + "2-90": "2.90", + "2-91": "2.91" } } }, From 37bb31de6520a03d7187b37f203e256706e2417d Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 14 Apr 2021 17:08:03 +0200 Subject: [PATCH 3/5] change sync server labels to Site Sync --- .../settings/entities/schemas/system_schema/schema_modules.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/system_schema/schema_modules.json b/openpype/settings/entities/schemas/system_schema/schema_modules.json index 8512514ff3..a30cafd0c2 100644 --- a/openpype/settings/entities/schemas/system_schema/schema_modules.json +++ b/openpype/settings/entities/schemas/system_schema/schema_modules.json @@ -82,7 +82,7 @@ }, { "type": "dict", "key": "sync_server", - "label": "Sync Server", + "label": "Site Sync", "collapsible": true, "checkbox_key": "enabled", "children": [{ From 5fe7955be7995ba6fcc72a3fa8957f6837e9405a Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 14 Apr 2021 17:08:19 +0200 Subject: [PATCH 4/5] change sync server label to Site Sync --- .../schemas/projects_schema/schema_project_syncserver.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_syncserver.json b/openpype/settings/entities/schemas/projects_schema/schema_project_syncserver.json index fd728f3982..ea1b8fc9da 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_syncserver.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_syncserver.json @@ -1,7 +1,7 @@ { "type": "dict", "key": "sync_server", - "label": "Sync Server (currently unused)", + "label": "Site Sync (beta testing)", "collapsible": true, "checkbox_key": "enabled", "is_file": true, From 92cf38161baf0e72d2766c301307c6159097c1c7 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 14 Apr 2021 17:08:37 +0200 Subject: [PATCH 5/5] save defaults for Create Look --- .../settings/defaults/project_settings/maya.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index a524ec45ae..dfece74f80 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -8,6 +8,13 @@ "yetiRig": "ma" }, "create": { + "CreateLook": { + "enabled": true, + "make_tx": true, + "defaults": [ + "Main" + ] + }, "CreateAnimation": { "enabled": true, "defaults": [ @@ -38,12 +45,6 @@ "Main" ] }, - "CreateLook": { - "enabled": true, - "defaults": [ - "Main" - ] - }, "CreateMayaScene": { "enabled": true, "defaults": [