From 1f1a2cde001e562e4042fe881caf06949e3f6a79 Mon Sep 17 00:00:00 2001 From: Petr Dvorak Date: Fri, 1 Dec 2023 09:37:16 +0100 Subject: [PATCH 1/5] Changes in default settings --- .../defaults/project_anatomy/attributes.json | 12 +- .../defaults/project_anatomy/templates.json | 12 - .../defaults/project_settings/blender.json | 20 +- .../defaults/project_settings/maya.json | 18 +- .../defaults/project_settings/unreal.json | 4 +- .../system_settings/applications.json | 986 +++++++----------- .../defaults/system_settings/tools.json | 445 ++++++-- 7 files changed, 767 insertions(+), 730 deletions(-) diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json index 0cc414fb69..f388a9336b 100644 --- a/openpype/settings/defaults/project_anatomy/attributes.json +++ b/openpype/settings/defaults/project_anatomy/attributes.json @@ -10,16 +10,8 @@ "resolutionHeight": 1080, "pixelAspect": 1.0, "applications": [ - "maya/2020", - "nuke/12-2", - "nukex/12-2", - "hiero/12-2", - "resolve/stable", - "houdini/18-5", - "blender/2-91", - "harmony/20", - "photoshop/2021", - "aftereffects/2021" + "maya/2024", + "nuke/14-0" ], "tools_env": [], "active": true diff --git a/openpype/settings/defaults/project_anatomy/templates.json b/openpype/settings/defaults/project_anatomy/templates.json index 5766a09100..6c3e038d27 100644 --- a/openpype/settings/defaults/project_anatomy/templates.json +++ b/openpype/settings/defaults/project_anatomy/templates.json @@ -38,16 +38,6 @@ "file": "{subset}_{@version}<_{output}><.{@frame}>.{ext}", "path": "{@folder}/{@file}" }, - "simpleUnrealTextureHero": { - "folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/hero", - "file": "{originalBasename}.{ext}", - "path": "{@folder}/{@file}" - }, - "simpleUnrealTexture": { - "folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{@version}", - "file": "{originalBasename}_{@version}.{ext}", - "path": "{@folder}/{@file}" - }, "online": { "folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}", "file": "{originalBasename}<.{@frame}><_{udim}>.{ext}", @@ -68,8 +58,6 @@ }, "__dynamic_keys_labels__": { "maya2unreal": "Maya to Unreal", - "simpleUnrealTextureHero": "Simple Unreal Texture - Hero", - "simpleUnrealTexture": "Simple Unreal Texture", "online": "online", "tycache": "tycache", "source": "source", diff --git a/openpype/settings/defaults/project_settings/blender.json b/openpype/settings/defaults/project_settings/blender.json index 385e97ef91..937d177d4a 100644 --- a/openpype/settings/defaults/project_settings/blender.json +++ b/openpype/settings/defaults/project_settings/blender.json @@ -2,7 +2,7 @@ "unit_scale_settings": { "enabled": true, "apply_on_opening": false, - "base_file_unit_scale": 0.01 + "base_file_unit_scale": 1.00 }, "set_resolution_startup": true, "set_frames_startup": true, @@ -31,7 +31,7 @@ }, "publish": { "ValidateCameraZeroKeyframe": { - "enabled": true, + "enabled": false, "optional": true, "active": true }, @@ -62,13 +62,13 @@ "active": true }, "ValidateTransformZero": { - "enabled": true, - "optional": false, + "enabled": false, + "optional": true, "active": true }, "ValidateNoColonsInName": { - "enabled": true, - "optional": false, + "enabled": false, + "optional": true, "active": true }, "ValidateInstanceEmpty": { @@ -90,9 +90,9 @@ ] }, "ExtractFBX": { - "enabled": true, + "enabled": false, "optional": true, - "active": false + "active": true }, "ExtractModelABC": { "enabled": true, @@ -105,9 +105,9 @@ "active": true }, "ExtractAnimationFBX": { - "enabled": true, + "enabled": false, "optional": true, - "active": false + "active": true }, "ExtractCamera": { "enabled": true, diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 7719a5e255..3ecefef4f9 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -1,5 +1,5 @@ { - "open_workfile_post_initialization": false, + "open_workfile_post_initialization": true, "explicit_plugins_loading": { "enabled": false, "plugins_to_load": [ @@ -458,7 +458,7 @@ "per_task_type": [] }, "scriptsmenu": { - "name": "OpenPype Tools", + "name": "Custom Tools", "definition": [ { "type": "action", @@ -708,7 +708,7 @@ "sync_workfile_version": false }, "CollectFbxAnimation": { - "enabled": true + "enabled": false }, "CollectFbxCamera": { "enabled": false @@ -785,7 +785,7 @@ ] }, "ValidatePluginPathAttributes": { - "enabled": true, + "enabled": false, "optional": false, "active": true, "attribute": { @@ -840,12 +840,12 @@ "active": true }, "ValidateGLSLMaterial": { - "enabled": true, + "enabled": false, "optional": false, "active": true }, "ValidateGLSLPlugin": { - "enabled": true, + "enabled": false, "optional": false, "active": true }, @@ -1096,7 +1096,7 @@ "active": true }, "ExtractProxyAlembic": { - "enabled": true, + "enabled": false, "families": [ "proxyAbc" ] @@ -1383,7 +1383,7 @@ "keep_image_planes": false }, "ExtractGLB": { - "enabled": true, + "enabled": false, "active": true, "ogsfx_path": "/maya2glTF/PBR/shaders/glTF_PBR.ogsfx" }, @@ -1581,7 +1581,7 @@ { "subset_name_filters": [], "families": [ - "sedress" + "setdress" ], "repre_names": [ "ma" diff --git a/openpype/settings/defaults/project_settings/unreal.json b/openpype/settings/defaults/project_settings/unreal.json index 20e55c74f0..dc7e4229aa 100644 --- a/openpype/settings/defaults/project_settings/unreal.json +++ b/openpype/settings/defaults/project_settings/unreal.json @@ -10,11 +10,11 @@ "rules": {} } }, - "level_sequences_for_layouts": false, + "level_sequences_for_layouts": true, "delete_unmatched_assets": false, "render_config_path": "", "preroll_frames": 0, - "render_format": "png", + "render_format": "exr", "project_setup": { "dev_mode": false } diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index a5283751e9..7dd767598e 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -18,7 +18,9 @@ "windows": [ "C:\\Program Files\\Autodesk\\Maya2024\\bin\\maya.exe" ], - "darwin": [], + "darwin": [ + "/Applications/Autodesk/maya2024/Maya.app" + ], "linux": [ "/usr/autodesk/maya2024/bin/maya" ] @@ -38,7 +40,9 @@ "windows": [ "C:\\Program Files\\Autodesk\\Maya2023\\bin\\maya.exe" ], - "darwin": [], + "darwin": [ + "/Applications/Autodesk/maya2023/Maya.app" + ], "linux": [ "/usr/autodesk/maya2023/bin/maya" ] @@ -58,7 +62,9 @@ "windows": [ "C:\\Program Files\\Autodesk\\Maya2022\\bin\\maya.exe" ], - "darwin": [], + "darwin": [ + "/Applications/Autodesk/maya2022/Maya.app" + ], "linux": [ "/usr/autodesk/maya2022/bin/maya" ] @@ -157,6 +163,24 @@ "environment": { "3DSMAX_VERSION": "2023" } + }, + "2024": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Autodesk\\3ds Max 2024\\3dsmax.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "3DSMAX_VERSION": "2024" + } } } }, @@ -238,15 +262,17 @@ ] }, "variants": { - "13-2": { + "15-0": { "use_python_2": false, "executables": { "windows": [ - "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" + ], + "darwin": [ + "/Applications/Nuke15.0v2/Nuke15.0v2.app" ], - "darwin": [], "linux": [ - "/usr/local/Nuke13.2v1/Nuke13.2" + "/usr/local/Nuke15.0v2/Nuke15.0" ] }, "arguments": { @@ -256,15 +282,37 @@ }, "environment": {} }, - "13-0": { + "14-0": { "use_python_2": false, "executables": { "windows": [ - "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" + ], + "darwin": [ + "/Applications/Nuke14.0v5/Nuke14.0v5.app" ], - "darwin": [], "linux": [ - "/usr/local/Nuke13.0v1/Nuke13.0" + "/usr/local/Nuke14.0v5/Nuke14.0" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, + "13-2": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + ], + "darwin": [ + "/Applications/Nuke13.2v1/Nuke13.2v1.app" + ], + "linux": [ + "/usr/local/Nuke13.2v1/Nuke13.2" ] }, "arguments": { @@ -280,9 +328,11 @@ "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" ], - "darwin": [], + "darwin": [ + "/Applications/Nuke12.2v3/Nuke12.2v3.app" + ], "linux": [ - "/usr/local/Nuke12.2v3Nuke12.2" + "/usr/local/Nuke12.2v3/Nuke12.2" ] }, "arguments": { @@ -292,82 +342,11 @@ }, "environment": {} }, - "12-0": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" - ], - "darwin": [], - "linux": [ - "/usr/local/Nuke12.0v1/Nuke12.0" - ] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, - "11-3": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" - ], - "darwin": [], - "linux": [ - "/usr/local/Nuke11.3v5/Nuke11.3" - ] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, - "11-2": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, - "11-0": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke11.0v4\\Nuke11.0.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, "__dynamic_keys_labels__": { + "15-0": "15.0", + "14-0": "14.0", "13-2": "13.2", - "13-0": "13.0", - "12-2": "12.2", - "12-0": "12.0", - "11-3": "11.3", - "11-2": "11.2", - "11-0": "11.0" + "12-2": "12.2" } } }, @@ -383,15 +362,17 @@ ] }, "variants": { - "13-2": { + "15-0": { "use_python_2": false, "executables": { "windows": [ - "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" + ], + "darwin": [ + "/Applications/Nuke15.0v2/Nuke15.0v2.app" ], - "darwin": [], "linux": [ - "/usr/local/Nuke13.2v1/Nuke13.2" + "/usr/local/Nuke15.0v2/Nuke15.0" ] }, "arguments": { @@ -407,15 +388,43 @@ }, "environment": {} }, - "13-0": { + "14-0": { "use_python_2": false, "executables": { "windows": [ - "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" + ], + "darwin": [ + "/Applications/Nuke14.0v5/Nuke14.0v5.app" ], - "darwin": [], "linux": [ - "/usr/local/Nuke13.0v1/Nuke13.0" + "/usr/local/Nuke14.0v5/Nuke14.0" + ] + }, + "arguments": { + "windows": [ + "--nukeassist" + ], + "darwin": [ + "--nukeassist" + ], + "linux": [ + "--nukeassist" + ] + }, + "environment": {} + }, + "13-2": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + ], + "darwin": [ + "/Applications/Nuke13.2v1/Nuke13.2v1.app" + ], + "linux": [ + "/usr/local/Nuke13.2v1/Nuke13.2" ] }, "arguments": { @@ -437,81 +446,13 @@ "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" ], - "darwin": [], - "linux": [ - "/usr/local/Nuke12.2v3Nuke12.2" - ] - }, - "arguments": { - "windows": [ - "--nukeassist" - ], "darwin": [ - "--nukeassist" + "/Applications/Nuke12.2v3/Nuke12.2v3.app" ], "linux": [ - "--nukeassist" + "/usr/local/Nuke12.2v3/Nuke12.2" ] }, - "environment": {} - }, - "12-0": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" - ], - "darwin": [], - "linux": [ - "/usr/local/Nuke12.0v1/Nuke12.0" - ] - }, - "arguments": { - "windows": [ - "--nukeassist" - ], - "darwin": [ - "--nukeassist" - ], - "linux": [ - "--nukeassist" - ] - }, - "environment": {} - }, - "11-3": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" - ], - "darwin": [], - "linux": [ - "/usr/local/Nuke11.3v5/Nuke11.3" - ] - }, - "arguments": { - "windows": [ - "--nukeassist" - ], - "darwin": [ - "--nukeassist" - ], - "linux": [ - "--nukeassist" - ] - }, - "environment": {} - }, - "11-2": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" - ], - "darwin": [], - "linux": [] - }, "arguments": { "windows": [ "--nukeassist" @@ -526,12 +467,10 @@ "environment": {} }, "__dynamic_keys_labels__": { + "15-0": "15.0", + "14-0": "14.0", "13-2": "13.2", - "13-0": "13.0", - "12-2": "12.2", - "12-0": "12.0", - "11-3": "11.3", - "11-2": "11.2" + "12-2": "12.2" } } }, @@ -547,15 +486,17 @@ ] }, "variants": { - "13-2": { + "15-0": { "use_python_2": false, "executables": { "windows": [ - "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" + ], + "darwin": [ + "/Applications/Nuke15.0v2/Nuke15.0v2.app" ], - "darwin": [], "linux": [ - "/usr/local/Nuke13.2v1/Nuke13.2" + "/usr/local/Nuke15.0v2/Nuke15.0" ] }, "arguments": { @@ -571,15 +512,43 @@ }, "environment": {} }, - "13-0": { + "14-0": { "use_python_2": false, "executables": { "windows": [ - "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" + ], + "darwin": [ + "/Applications/Nuke14.0v5/Nuke14.0v5.app" ], - "darwin": [], "linux": [ - "/usr/local/Nuke13.0v1/Nuke13.0" + "/usr/local/Nuke14.0v5/Nuke14.0" + ] + }, + "arguments": { + "windows": [ + "--nukex" + ], + "darwin": [ + "--nukex" + ], + "linux": [ + "--nukex" + ] + }, + "environment": {} + }, + "13-2": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + ], + "darwin": [ + "/Applications/Nuke13.2v1/Nuke13.2v1.app" + ], + "linux": [ + "/usr/local/Nuke13.2v1/Nuke13.2" ] }, "arguments": { @@ -601,81 +570,13 @@ "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" ], - "darwin": [], - "linux": [ - "/usr/local/Nuke12.2v3Nuke12.2" - ] - }, - "arguments": { - "windows": [ - "--nukex" - ], "darwin": [ - "--nukex" + "/Applications/Nuke12.2v3/Nuke12.2v3.app" ], "linux": [ - "--nukex" + "/usr/local/Nuke12.2v3/Nuke12.2" ] }, - "environment": {} - }, - "12-0": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" - ], - "darwin": [], - "linux": [ - "/usr/local/Nuke12.0v1/Nuke12.0" - ] - }, - "arguments": { - "windows": [ - "--nukex" - ], - "darwin": [ - "--nukex" - ], - "linux": [ - "--nukex" - ] - }, - "environment": {} - }, - "11-3": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" - ], - "darwin": [], - "linux": [ - "/usr/local/Nuke11.3v5/Nuke11.3" - ] - }, - "arguments": { - "windows": [ - "--nukex" - ], - "darwin": [ - "--nukex" - ], - "linux": [ - "--nukex" - ] - }, - "environment": {} - }, - "11-2": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" - ], - "darwin": [], - "linux": [] - }, "arguments": { "windows": [ "--nukex" @@ -690,12 +591,10 @@ "environment": {} }, "__dynamic_keys_labels__": { + "15-0": "15.0", + "14-0": "14.0", "13-2": "13.2", - "13-0": "13.0", - "12-2": "12.2", - "12-0": "12.0", - "11-3": "11.3", - "11-2": "11.2" + "12-2": "12.2" } } }, @@ -709,15 +608,17 @@ "TAG_ASSETBUILD_STARTUP": "0" }, "variants": { - "13-2": { + "15-0": { "use_python_2": false, "executables": { "windows": [ - "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" + ], + "darwin": [ + "/Applications/Nuke15.0v2/Nuke15.0v2.app" ], - "darwin": [], "linux": [ - "/usr/local/Nuke13.2v1/Nuke13.2" + "/usr/local/Nuke15.0v2/Nuke15.0" ] }, "arguments": { @@ -733,15 +634,43 @@ }, "environment": {} }, - "13-0": { + "14-0": { "use_python_2": false, "executables": { "windows": [ - "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" + ], + "darwin": [ + "/Applications/Nuke14.0v5/Nuke14.0v5.app" ], - "darwin": [], "linux": [ - "/usr/local/Nuke13.0v1/Nuke13.0" + "/usr/local/Nuke14.0v1/Nuke14.0" + ] + }, + "arguments": { + "windows": [ + "--studio" + ], + "darwin": [ + "--studio" + ], + "linux": [ + "--studio" + ] + }, + "environment": {} + }, + "13-2": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + ], + "darwin": [ + "/Applications/Nuke13.2v1/Nuke13.2v1.app" + ], + "linux": [ + "/usr/local/Nuke13.2v1/Nuke13.2" ] }, "arguments": { @@ -763,79 +692,13 @@ "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" ], - "darwin": [], - "linux": [ - "/usr/local/Nuke12.2v3Nuke12.2" - ] - }, - "arguments": { - "windows": [ - "--studio" - ], "darwin": [ - "--studio" + "/Applications/Nuke12.2v3/Nuke12.2v3.app" ], "linux": [ - "--studio" + "/usr/local/Nuke12.2v3/Nuke12.2" ] }, - "environment": {} - }, - "12-0": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" - ], - "darwin": [], - "linux": [ - "/usr/local/Nuke12.0v1/Nuke12.0" - ] - }, - "arguments": { - "windows": [ - "--studio" - ], - "darwin": [ - "--studio" - ], - "linux": [ - "--studio" - ] - }, - "environment": {} - }, - "11-3": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" - ], - "darwin": [], - "linux": [ - "/usr/local/Nuke11.3v5/Nuke11.3" - ] - }, - "arguments": { - "windows": [ - "--studio" - ], - "darwin": [ - "--studio" - ], - "linux": [ - "--studio" - ] - }, - "environment": {} - }, - "11-2": { - "use_python_2": true, - "executables": { - "windows": [], - "darwin": [], - "linux": [] - }, "arguments": { "windows": [ "--studio" @@ -850,12 +713,10 @@ "environment": {} }, "__dynamic_keys_labels__": { + "15-0": "15.0", + "14-0": "14.0", "13-2": "13.2", - "13-0": "13.0", - "12-2": "12.2", - "12-0": "12.0", - "11-3": "11.3", - "11-2": "11.2" + "12-2": "12.2" } } }, @@ -869,15 +730,17 @@ "TAG_ASSETBUILD_STARTUP": "0" }, "variants": { - "13-2": { + "15-0": { "use_python_2": false, "executables": { "windows": [ - "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" + ], + "darwin": [ + "/Applications/Nuke15.0v2/Nuke15.0v2.app" ], - "darwin": [], "linux": [ - "/usr/local/Nuke13.2v1/Nuke13.2" + "/usr/local/Nuke15.0v2/Nuke15.0" ] }, "arguments": { @@ -893,15 +756,43 @@ }, "environment": {} }, - "13-0": { + "14-0": { "use_python_2": false, "executables": { "windows": [ - "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" + ], + "darwin": [ + "/Applications/Nuke14.0v5/Nuke14.0v5.app" ], - "darwin": [], "linux": [ - "/usr/local/Nuke13.0v1/Nuke13.0" + "/usr/local/Nuke14.0v5/Nuke14.0" + ] + }, + "arguments": { + "windows": [ + "--hiero" + ], + "darwin": [ + "--hiero" + ], + "linux": [ + "--hiero" + ] + }, + "environment": {} + }, + "13-2": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" + ], + "darwin": [ + "/Applications/Nuke13.2v1/Nuke13.2v1.app" + ], + "linux": [ + "/usr/local/Nuke13.2v1/Nuke13.2" ] }, "arguments": { @@ -923,81 +814,13 @@ "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" ], - "darwin": [], - "linux": [ - "/usr/local/Nuke12.2v3Nuke12.2" - ] - }, - "arguments": { - "windows": [ - "--hiero" - ], "darwin": [ - "--hiero" + "/Applications/Nuke12.2v3/Nuke12.2v3.app" ], "linux": [ - "--hiero" + "/usr/local/Nuke12.2v3/Nuke12.2" ] }, - "environment": {} - }, - "12-0": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" - ], - "darwin": [], - "linux": [ - "/usr/local/Nuke12.0v1/Nuke12.0" - ] - }, - "arguments": { - "windows": [ - "--hiero" - ], - "darwin": [ - "--hiero" - ], - "linux": [ - "--hiero" - ] - }, - "environment": {} - }, - "11-3": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" - ], - "darwin": [], - "linux": [ - "/usr/local/Nuke11.3v5/Nuke11.3" - ] - }, - "arguments": { - "windows": [ - "--hiero" - ], - "darwin": [ - "--hiero" - ], - "linux": [ - "--hiero" - ] - }, - "environment": {} - }, - "11-2": { - "use_python_2": true, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" - ], - "darwin": [], - "linux": [] - }, "arguments": { "windows": [ "--hiero" @@ -1012,12 +835,10 @@ "environment": {} }, "__dynamic_keys_labels__": { + "15-0": "15.0", + "14-0": "14.0", "13-2": "13.2", - "13-0": "13.0", - "12-2": "12.2", - "12-0": "12.0", - "11-3": "11.3", - "11-2": "11.2" + "12-2": "12.2" } } }, @@ -1063,36 +884,6 @@ "linux": [] }, "environment": {} - }, - "16": { - "executables": { - "windows": [ - "C:\\Program Files\\Blackmagic Design\\Fusion 16\\Fusion.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, - "9": { - "executables": { - "windows": [ - "C:\\Program Files\\Blackmagic Design\\Fusion 9\\Fusion.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} } } }, @@ -1137,54 +928,27 @@ "host_name": "houdini", "environment": {}, "variants": { - "18-5": { + "19-5-716": { "use_python_2": true, "executables": { "windows": [ - "C:\\Program Files\\Side Effects Software\\Houdini 18.5.499\\bin\\houdini.exe" + "c:\\Program Files\\Side Effects Software\\Houdini 19.5.716\\bin\\houdini.exe" ], - "darwin": [], - "linux": [] + "darwin": [ + "/Applications/Houdini/Houdini19.5.716/Houdini.app" + ], + "linux": [ + "/opt/hfs19.5.716/bin/houdini" + ] }, "arguments": { "windows": [], "darwin": [], "linux": [] }, - "environment": {} - }, - "18": { - "use_python_2": true, - "executables": { - "windows": [], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, - "17": { - "use_python_2": true, - "executables": { - "windows": [], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, - "__dynamic_keys_labels__": { - "18-5": "18.5", - "18": "18", - "17": "17" + "environment": { + "HOUDINI_VERSION": "19.5.716" + } } } }, @@ -1195,73 +959,23 @@ "host_name": "blender", "environment": {}, "variants": { - "2-83": { + "3-6-5": { "executables": { "windows": [ - "C:\\Program Files\\Blender Foundation\\Blender 2.83\\blender.exe" + "C:\\Program Files\\Blender Foundation\\Blender 3.6\\blender.exe" ], "darwin": [], "linux": [] }, "arguments": { - "windows": [ - "--python-use-system-env" - ], - "darwin": [ - "--python-use-system-env" - ], - "linux": [ - "--python-use-system-env" - ] - }, - "environment": {} - }, - "2-90": { - "executables": { - "windows": [ - "C:\\Program Files\\Blender Foundation\\Blender 2.90\\blender.exe" - ], + "windows": [], "darwin": [], "linux": [] }, - "arguments": { - "windows": [ - "--python-use-system-env" - ], - "darwin": [ - "--python-use-system-env" - ], - "linux": [ - "--python-use-system-env" - ] - }, - "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-91": "2.91" + "3-6-5": "3.6.5 LTS" } } }, @@ -1274,6 +988,23 @@ "AVALON_HARMONY_WORKFILES_ON_LAUNCH": "1" }, "variants": { + "22": { + "executables": { + "windows": [ + "c:\\Program Files (x86)\\Toon Boom Animation\\Toon Boom Harmony 22 Premium\\win64\\bin\\HarmonyPremium.exe" + ], + "darwin": [ + "/Applications/Toon Boom Harmony 22 Premium/Harmony Premium.app/Contents/MacOS/Harmony Premium" + ], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, "21": { "executables": { "windows": [ @@ -1307,23 +1038,6 @@ "linux": [] }, "environment": {} - }, - "17": { - "executables": { - "windows": [ - "c:\\Program Files (x86)\\Toon Boom Animation\\Toon Boom Harmony 17 Premium\\win64\\bin\\HarmonyPremium.exe" - ], - "darwin": [ - "/Applications/Toon Boom Harmony 17 Premium/Harmony Premium.app/Contents/MacOS/Harmony Premium" - ], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} } } }, @@ -1380,44 +1094,50 @@ "WORKFILES_SAVE_AS": "Yes" }, "variants": { - "2020": { - "executables": { - "windows": [ - "C:\\Program Files\\Adobe\\Adobe Photoshop 2020\\Photoshop.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, - "2021": { - "executables": { - "windows": [ - "C:\\Program Files\\Adobe\\Adobe Photoshop 2021\\Photoshop.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, "2022": { "executables": { "windows": [ "C:\\Program Files\\Adobe\\Adobe Photoshop 2022\\Photoshop.exe" ], + "darwin": [ + "/Applications/Adobe Photoshop 2022/Adobe Photoshop 2022" + ], + "linux": [] + }, + "arguments": { + "windows": [], "darwin": [], "linux": [] }, + "environment": {} + }, + "2023": { + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe Photoshop 2023\\Photoshop.exe" + ], + "darwin": [ + "/Applications/Adobe Photoshop 2023/Adobe Photoshop 2023" + ], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, + "2024": { + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe Photoshop 2024\\Photoshop.exe" + ], + "darwin": [ + "/Applications/Adobe Photoshop 2024/Adobe Photoshop 2024" + ], + "linux": [] + }, "arguments": { "windows": [], "darwin": [], @@ -1437,44 +1157,54 @@ "WORKFILES_SAVE_AS": "Yes" }, "variants": { - "2020": { - "executables": { - "windows": [ - "C:\\Program Files\\Adobe\\Adobe After Effects 2020\\Support Files\\AfterFX.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, - "2021": { - "executables": { - "windows": [ - "C:\\Program Files\\Adobe\\Adobe After Effects 2021\\Support Files\\AfterFX.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, "2022": { "executables": { "windows": [ "C:\\Program Files\\Adobe\\Adobe After Effects 2022\\Support Files\\AfterFX.exe" ], + "darwin": [ + "/Applications/Adobe After Effects 2022/Adobe After Effects 2022" + ], + "linux": [] + }, + "arguments": { + "windows": [], "darwin": [], "linux": [] }, + "environment": { + "MULTIPROCESS": "No" + } + }, + "2023": { + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe After Effects 2023\\Support Files\\AfterFX.exe" + ], + "darwin": [ + "/Applications/Adobe After Effects 2023/Adobe After Effects 2023" + ], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "MULTIPROCESS": "No" + } + }, + "2024": { + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe After Effects 2024\\Support Files\\AfterFX.exe" + ], + "darwin": [ + "/Applications/Adobe After Effects 2024/Adobe After Effects 2024" + ], + "linux": [] + }, "arguments": { "windows": [], "darwin": [], @@ -1522,7 +1252,7 @@ "host_name": "substancepainter", "environment": {}, "variants": { - "8-2-0": { + "stable": { "executables": { "windows": [ "C:\\Program Files\\Adobe\\Adobe Substance 3D Painter\\Adobe Substance 3D Painter.exe" @@ -1536,9 +1266,6 @@ "linux": [] }, "environment": {} - }, - "__dynamic_keys_labels__": { - "8-2-0": "8.2.0" } } }, @@ -1583,9 +1310,26 @@ }, "environment": {} }, + "5-2": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Epic Games\\UE_5.2\\Engine\\Binaries\\Win64\\UnrealEditor.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, "__dynamic_keys_labels__": { + "5-0": "Unreal 5.0", "5-1": "Unreal 5.1", - "5-0": "Unreal 5.0" + "5-2": "Unreal 5.2" } } }, diff --git a/openpype/settings/defaults/system_settings/tools.json b/openpype/settings/defaults/system_settings/tools.json index 921e13af3a..9e768b91e9 100644 --- a/openpype/settings/defaults/system_settings/tools.json +++ b/openpype/settings/defaults/system_settings/tools.json @@ -1,90 +1,403 @@ { "tool_groups": { + "htoa": { + "environment": { + "HOUDINI_PATH": [ + "{STUDIO_SW}/APP/HTOA/{HTOA_VERSION}/HOUDINI{HOUDINI_VERSION}/WINDOWS/htoa-6.1.3.3_rdb15014_houdini-{HTOA_VERSION}", + "{HOUDINI_PATH}" + ], + "PATH": { + "windows": [ + "{STUDIO_SW}/APP/HTOA/{HTOA_VERSION}/HOUDINI{HOUDINI_VERSION}/WINDOWS/htoa-6.1.3.3_rdb15014_houdini-{HTOA_VERSION}/scripts/bin", + "{PATH}" + ] + } + }, + "variants": { + "5-4-2-7": { + "host_names": [ + "houdini" + ], + "app_variants": [], + "environment": { + "HTOA_VERSION": "5.4.2.7" + } + } + } + }, "mtoa": { "environment": { - "MTOA": "{STUDIO_SOFTWARE}/arnold/mtoa_{MAYA_VERSION}_{MTOA_VERSION}", - "MAYA_RENDER_DESC_PATH": "{MTOA}", - "MAYA_MODULE_PATH": "{MTOA}", - "ARNOLD_PLUGIN_PATH": "{MTOA}/shaders", - "MTOA_EXTENSIONS_PATH": { - "darwin": "{MTOA}/extensions", - "linux": "{MTOA}/extensions", - "windows": "{MTOA}/extensions" - }, - "MTOA_EXTENSIONS": { - "darwin": "{MTOA}/extensions", - "linux": "{MTOA}/extensions", - "windows": "{MTOA}/extensions" + "MTOA": { + "darwin": "{STUDIO_SW}/APP/MTOA/{MTOA_VERSION}/MAYA{MAYA_VERSION}/MAC", + "linux": "{STUDIO_SW}/APP/MTOA/{MTOA_VERSION}/MAYA{MAYA_VERSION}/LINUX", + "windows": "{STUDIO_SW}/APP/MTOA/{MTOA_VERSION}/MAYA{MAYA_VERSION}/WINDOWS" }, + "MAYA_MODULE_PATH": [ + "{STUDIO_SW}/APP/MTOA", + "{MAYA_MODULE_PATH}" + ], "DYLD_LIBRARY_PATH": { "darwin": "{MTOA}/bin" }, "PATH": { - "windows": "{PATH};{MTOA}/bin" - } + "windows": [ + "{MTOA}/bin", + "{PATH}" + ] + }, + "XBMLANGPATH": [ + "{MTOA}/icons", + "{XBMLANGPATH}" + ], + "MAYA_RENDER_DESC_PATH": [ + "{MTOA}", + "{MAYA_RENDER_DESC_PATH}" + ], + "MTOA_STARTUP_LOG_VERBOSITY": "3" }, "variants": { - "3-2": { - "host_names": [], - "app_variants": [], - "environment": { - "MTOA_VERSION": "3.2" - } - }, - "3-1": { - "host_names": [], - "app_variants": [], - "environment": { - "MTOA_VERSION": "3.1" - } - }, - "__dynamic_keys_labels__": { - "3-2": "3.2", - "3-1": "3.1" - } - } - }, - "vray": { - "environment": {}, - "variants": {} - }, - "yeti": { - "environment": {}, - "variants": {} - }, - "renderman": { - "environment": {}, - "variants": { - "24-3-maya": { + "5-3-1-0": { "host_names": [ "maya" ], - "app_variants": [ - "maya/2022" - ], + "app_variants": [], "environment": { - "RFMTREE": { - "windows": "C:\\Program Files\\Pixar\\RenderManForMaya-24.3", - "darwin": "/Applications/Pixar/RenderManForMaya-24.3", - "linux": "/opt/pixar/RenderManForMaya-24.3" - }, - "RMANTREE": { - "windows": "C:\\Program Files\\Pixar\\RenderManProServer-24.3", - "darwin": "/Applications/Pixar/RenderManProServer-24.3", - "linux": "/opt/pixar/RenderManProServer-24.3" - } + "MTOA_VERSION": "5.3.1.0" } }, - "__dynamic_keys_labels__": { - "24-3-maya": "24.3 RFM" + "5-3-4-1": { + "host_names": [ + "maya" + ], + "app_variants": [], + "environment": { + "MTOA_VERSION": "5.3.1.0" + } + } + } + }, + "rendermanMaya": { + "environment": { + "RFMTREE": { + "darwin": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/MAC/MAYA", + "linux": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/LINUX/MAYA", + "windows": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/WINDOWS/MAYA" + }, + "RMANTREE": { + "darwin": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/MAC/RenderManProServer-{RM_VERSION}", + "linux": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/LINUX/RenderManProServer-{RM_VERSION}", + "windows": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/WINDOWS/RenderManProServer-{RM_VERSION}" + }, + "MAYA_MODULE_PATH": [ + "{STUDIO_SW}/APP/RENDERMAN", + "{MAYA_MODULE_PATH}" + ], + "PIXAR_LICENSE_FILE": "{STUDIO_SW}/APP/RENDERMAN/pixar.license", + "RFM_DO_NOT_CREATE_MODULE_FILE": "1" + }, + "variants": { + "24-3": { + "host_names": [ + "maya" + ], + "app_variants": [], + "environment": { + "RM_VERSION": "24.3" + } + } + } + }, + "yetiMaya": { + "environment": { + "YETI_HOME": { + "darwin": "{STUDIO_SW}/APP/YETI/{YETI_VERSION}/MAYA{MAYA_VERSION}/MAC", + "linux": "{STUDIO_SW}/APP/YETI/{YETI_VERSION}/MAYA{MAYA_VERSION}/LINUX", + "windows": "{STUDIO_SW}/APP/YETI/{YETI_VERSION}/MAYA{MAYA_VERSION}/WINDOWS" + }, + "YETI_TMP": { + "windows": "C:/temp", + "darwin": "/tmp", + "linux": "/tmp" + }, + "peregrinel_LICENSE": "", + "MAYA_MODULE_PATH": [ + "{STUDIO_SW}/APP/YETI", + "{MAYA_MODULE_PATH}" + ] + }, + "variants": { + "4-2-11": { + "host_names": [ + "maya" + ], + "app_variants": [], + "environment": { + "YETI_VERSION": "4.2.11" + } + } + } + }, + "redshiftMaya": { + "environment": { + "REDSHIFT_COREDATAPATH": { + "darwin": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/MAC", + "linux": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/LINUX", + "windows": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/WINDOWS" + }, + "REDSHIFT_ABORTONLICENSEFAIL": "0", + "MAYA_MODULE_PATH": [ + "{STUDIO_SW}/APP/REDSHIFT", + "{MAYA_MODULE_PATH}" + ], + "MAYA_PLUG_IN_PATH": { + "windows": [ + "{REDSHIFT_COREDATAPATH}/Plugins/Maya/{MAYA_VERSION}/nt-x86-64", + "{MAYA_PLUG_IN_PATH}" + ], + "linux": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/{MAYA_VERSION}", + "{MAYA_PLUG_IN_PATH}" + ], + "darwin": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/{MAYA_VERSION}", + "{MAYA_PLUG_IN_PATH}" + ] + }, + "MAYA_SCRIPT_PATH": { + "windows": [ + "{REDSHIFT_COREDATAPATH}/Plugins/Maya/Common/scripts", + "{MAYA_SCRIPT_PATH}" + ], + "linux": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/common/scripts", + "{MAYA_SCRIPT_PATH}" + ], + "darwin": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/common/scripts", + "{MAYA_SCRIPT_PATH}" + ] + }, + "REDSHIFT_PROCEDURALSPATH": { + "windows": [ + "{REDSHIFT_COREDATAPATH}/Procedurals", + "{REDSHIFT_PROCEDURALSPATH}" + ], + "linux": [ + "{REDSHIFT_COREDATAPATH}/procedurals", + "{REDSHIFT_PROCEDURALSPATH}" + ], + "darwin": [ + "{REDSHIFT_COREDATAPATH}/procedurals", + "{REDSHIFT_PROCEDURALSPATH}" + ] + }, + "REDSHIFT_MAYAEXTENSIONSPATH": { + "windows": [ + "{REDSHIFT_COREDATAPATH}/Plugins/Maya/{MAYA_VERSION}/nt-x86-64/extensions", + "{REDSHIFT_MAYAEXTENSIONSPATH}" + ], + "linux": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/{MAYA_VERSION}/extensions", + "{REDSHIFT_MAYAEXTENSIONSPATH}" + ], + "darwin": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/{MAYA_VERSION}/extensions", + "{REDSHIFT_MAYAEXTENSIONSPATH}" + ] + }, + "XBMLANGPATH": { + "windows": [ + "{REDSHIFT_COREDATAPATH}/Plugins/Maya/Common/icons", + "{XBMLANGPATH}" + ], + "linux": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/common/icons", + "{XBMLANGPATH}" + ], + "darwin": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/common/icons", + "{XBMLANGPATH}" + ] + }, + "MAYA_RENDER_DESC_PATH": { + "windows": [ + "{REDSHIFT_COREDATAPATH}/Plugins/Maya/Common/rendererDesc", + "{MAYA_RENDER_DESC_PATH}" + ], + "linux": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/common/rendererDesc", + "{MAYA_RENDER_DESC_PATH}" + ], + "darwin": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/common/rendererDesc", + "{MAYA_RENDER_DESC_PATH}" + ] + }, + "MAYA_CUSTOM_TEMPLATE_PATH": { + "windows": [ + "{REDSHIFT_COREDATAPATH}/Plugins/Maya/Common/scripts/NETemplates", + "{MAYA_CUSTOM_TEMPLATE_PATH}" + ], + "linux": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/common/scripts/NETemplates", + "{MAYA_CUSTOM_TEMPLATE_PATH}" + ], + "darwin": [ + "{REDSHIFT_COREDATAPATH}/redshift4maya/common/scripts/NETemplates", + "{MAYA_CUSTOM_TEMPLATE_PATH}" + ] + }, + "PATH": { + "windows": [ + "{REDSHIFT_COREDATAPATH}/bin", + "{PATH}" + ] + } + }, + "variants": { + "3-5-19": { + "host_names": [ + "maya" + ], + "app_variants": [], + "environment": { + "REDSHIFT_VERSION": "3.5.19" + } + } + } + }, + "redshift3dsmax": { + "environment": { + "REDSHIFT_COREDATAPATH": { + "darwin": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/MAC", + "linux": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/LINUX", + "windows": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/WINDOWS" + }, + "REDSHIFT_ABORTONLICENSEFAIL": "0", + "REDSHIFT_PROCEDURALSPATH": { + "windows": [ + "{REDSHIFT_COREDATAPATH}/Procedurals", + "{REDSHIFT_PROCEDURALSPATH}" + ], + "linux": [ + "{REDSHIFT_COREDATAPATH}/procedurals", + "{REDSHIFT_PROCEDURALSPATH}" + ], + "darwin": [ + "{REDSHIFT_COREDATAPATH}/procedurals", + "{REDSHIFT_PROCEDURALSPATH}" + ] + }, + "PATH": { + "windows": [ + "{REDSHIFT_COREDATAPATH}/bin", + "{PATH}" + ] + } + }, + "variants": { + "3-5-19": { + "host_names": [ + "max" + ], + "app_variants": [], + "environment": { + "REDSHIFT_VERSION": "3.5.19" + } + } + } + }, + "mGear": { + "environment": { + "MGEAR_ROOT": "{STUDIO_SW}/APP/MGEAR/{MGEAR_VERSION}/MAYA{MAYA_VERSION}/windows/x64", + "MAYA_MODULE_PATH": [ + "{STUDIO_SW}/APP/MGEAR/{MGEAR_VERSION}/release", + "{MAYA_MODULE_PATH}" + ] + }, + "variants": { + "4-0-7": { + "host_names": [ + "maya" + ], + "app_variants": [], + "environment": { + "MGEAR_VERSION": "4.0.7" + } + } + } + }, + "vrayMaya": { + "environment": { + "MAYA_MODULE_PATH": { + "windows": [ + "{STUDIO_SW}/APP/VRAY/{VRAY_VERSION}/MAYA{MAYA_VERSION}/WINDOWS/maya_root/modules", + "{MAYA_MODULE_PATH}" + ], + "linux": [ + "{STUDIO_SW}/APP/VRAY/{VRAY_VERSION}/MAYA{MAYA_VERSION}/LINUX/maya_root/modules", + "{MAYA_MODULE_PATH}" + ], + "darwin": [ + "{STUDIO_SW}/APP/VRAY/{VRAY_VERSION}/MAYA{MAYA_VERSION}/MAC/maya_root/modules", + "{MAYA_MODULE_PATH}" + ] + }, + "VRAY_AUTH_CLIENT_FILE_PATH": "{STUDIO_SW}/APP/VRAY" + }, + "variants": { + "6-10-01": { + "host_names": [ + "maya" + ], + "app_variants": [], + "environment": { + "VRAY_VERSION": "6.10.01" + } + } + } + }, + "vraynuke": { + "environment": { + "VRAY_FOR_NUKE_13_0_PLUGINS": { + "windows": "{STUDIO_SW}/APP/VRAYNUKE/{VRAYNUKE_VERSION}/NUKE{NUKE_VRAY_VERSION}/WINDOWS/nuke_vray/plugins/vray" + }, + "NUKE_PATH": { + "windows": [ + "{STUDIO_SW}/APP/VRAYNUKE/{VRAYNUKE_VERSION}/NUKE{NUKE_VRAY_VERSION}/WINDOWS/nuke_root", + "{NUKE_PATH}" + ] + }, + "PATH": { + "windows": [ + "{STUDIO_SW}/APP/VRAYNUKE/{VRAYNUKE_VERSION}/NUKE{NUKE_VRAY_VERSION}/WINDOWS/nuke_vray", + "{PATH}" + ] + }, + "VRAY_AUTH_CLIENT_FILE_PATH": "{STUDIO_SW}/APP/VRAY" + }, + "variants": { + "5-20-00": { + "host_names": [ + "nuke" + ], + "app_variants": [], + "environment": { + "VRAYNUKE_VERSION": "5.20.00" + } } } }, "__dynamic_keys_labels__": { - "mtoa": "Autodesk Arnold", - "vray": "Chaos Group Vray", - "yeti": "Peregrine Labs Yeti", - "renderman": "Pixar Renderman" + "htoa": "Arnold for Houdini (example)", + "mtoa": "Arnold for Maya (example)", + "rendermanMaya": "Renderman for Maya (example)", + "yetiMaya": "Yeti for Maya (example)", + "redshiftMaya": "Redshift for Maya (example)", + "redshift3dsmax": "Redshift for 3dsmax (example)", + "mGear": "mGear for Maya (example)", + "vrayMaya": "Vray for Maya (example)", + "vraynuke": "Vray for Nuke (example)" } } } From 74a949685ed1ac1e4bd0f1ad8b16a427dee54b93 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 6 Dec 2023 16:37:27 +0100 Subject: [PATCH 2/5] new defaults for AYON --- .../applications/server/applications.json | 598 ++++++++++-------- server_addon/applications/server/settings.py | 2 +- server_addon/blender/server/settings/main.py | 2 +- .../server/settings/publish_plugins.py | 18 +- server_addon/maya/server/settings/main.py | 2 +- .../maya/server/settings/publishers.py | 12 +- .../settings/workfile_build_settings.py | 2 +- server_addon/unreal/server/settings.py | 4 +- 8 files changed, 340 insertions(+), 300 deletions(-) diff --git a/server_addon/applications/server/applications.json b/server_addon/applications/server/applications.json index 825f50276a..4a65d1cc1c 100644 --- a/server_addon/applications/server/applications.json +++ b/server_addon/applications/server/applications.json @@ -14,7 +14,7 @@ "windows": [ "C:\\Program Files\\Autodesk\\Maya2024\\bin\\maya.exe" ], - "darwin": [], + "darwin": ["/Applications/Autodesk/maya2024/Maya.app"], "linux": [ "/usr/autodesk/maya2024/bin/maya" ] @@ -34,7 +34,7 @@ "windows": [ "C:\\Program Files\\Autodesk\\Maya2023\\bin\\maya.exe" ], - "darwin": [], + "darwin": ["/Applications/Autodesk/maya2023/Maya.app"], "linux": [ "/usr/autodesk/maya2023/bin/maya" ] @@ -54,7 +54,7 @@ "windows": [ "C:\\Program Files\\Autodesk\\Maya2022\\bin\\maya.exe" ], - "darwin": [], + "darwin": ["/Applications/Autodesk/maya2022/Maya.app"], "linux": [ "/usr/autodesk/maya2022/bin/maya" ] @@ -125,6 +125,23 @@ "host_name": "max", "environment": "{\n \"ADSK_3DSMAX_STARTUPSCRIPTS_ADDON_DIR\": \"{OPENPYPE_ROOT}/openpype/hosts/max/startup\"\n}", "variants": [ + { + "name": "2024", + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Autodesk\\3ds Max 2024\\3dsmax.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{\n \"3DSMAX_VERSION\": \"2024\"\n}" + }, { "name": "2023", "use_python_2": false, @@ -200,18 +217,40 @@ "host_name": "nuke", "environment": "{\n \"NUKE_PATH\": [\n \"{NUKE_PATH}\",\n \"{OPENPYPE_STUDIO_PLUGINS}/nuke\"\n ]\n}", "variants": [ + { + "name": "15-0", + "label": "15.0", + "executables": { + "windows": [ + "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" + ], + "darwin": [ + "/Applications/Nuke15.0v2/Nuke15.0v2.app" + ], + "linux": [ + "/usr/local/Nuke5.0v2/Nuke15.0" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{}", + "use_python_2": false + }, { "name": "14-0", "label": "14.0", "executables": { "windows": [ - "C:\\Program Files\\Nuke14.0v4\\Nuke14.0.exe" + "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" ], "darwin": [ - "/Applications/Nuke14.0v4/Nuke14.0v4.app" + "/Applications/Nuke14.0v5/Nuke14.0v5.app" ], "linux": [ - "/usr/local/Nuke14.0v4/Nuke14.0" + "/usr/local/Nuke14.0v5/Nuke14.0" ] }, "arguments": { @@ -243,28 +282,6 @@ }, "environment": "{}", "use_python_2": false - }, - { - "name": "13-0", - "label": "13.0", - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" - ], - "darwin": [ - "/Applications/Nuke13.0v1/Nuke13.0v1.app" - ], - "linux": [ - "/usr/local/Nuke13.0v1/Nuke13.0" - ] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": "{}" } ] }, @@ -275,28 +292,46 @@ "host_name": "nuke", "environment": "{\n \"NUKE_PATH\": [\n \"{NUKE_PATH}\",\n \"{OPENPYPE_STUDIO_PLUGINS}/nuke\"\n ]\n}", "variants": [ + { + "name": "15-0", + "label": "15.0", + "executables": { + "windows": [ + "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" + ], + "darwin": [ + "/Applications/Nuke15.0v2/NukeAssist15.0v2.app" + ], + "linux": [ + "/usr/local/Nuke5.0v2/Nuke15.0" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{}", + "use_python_2": false + }, { "name": "14-0", "label": "14.0", "executables": { "windows": [ - "C:\\Program Files\\Nuke14.0v4\\Nuke14.0.exe" + "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" ], "darwin": [ - "/Applications/Nuke14.0v4/NukeAssist14.0v4.app" + "/Applications/Nuke14.0v5/NukeAssist14.0v5.app" ], "linux": [ - "/usr/local/Nuke14.0v4/Nuke14.0" + "/usr/local/Nuke14.0v5/Nuke14.0" ] }, "arguments": { - "windows": [ - "--nukeassist" - ], + "windows": [], "darwin": [], - "linux": [ - "--nukeassist" - ] + "linux": [] }, "environment": "{}", "use_python_2": false @@ -316,44 +351,13 @@ ] }, "arguments": { - "windows": [ - "--nukeassist" - ], + "windows": [], "darwin": [], - "linux": [ - "--nukeassist" - ] + "linux": [] }, "environment": "{}", "use_python_2": false - }, - { - "name": "13-0", - "label": "13.0", - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" - ], - "darwin": [ - "/Applications/Nuke13.0v1/NukeAssist13.0v1.app" - ], - "linux": [ - "/usr/local/Nuke13.0v1/Nuke13.0" - ] - }, - "arguments": { - "windows": [ - "--nukeassist" - ], - "darwin": [], - "linux": [ - "--nukeassist" - ] - }, - "environment": "{}" } - ] }, "nukex": { "enabled": true, @@ -362,28 +366,46 @@ "host_name": "nuke", "environment": "{\n \"NUKE_PATH\": [\n \"{NUKE_PATH}\",\n \"{OPENPYPE_STUDIO_PLUGINS}/nuke\"\n ]\n}", "variants": [ + { + "name": "15-0", + "label": "15.0", + "executables": { + "windows": [ + "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" + ], + "darwin": [ + "/Applications/Nuke15.0v2/NukeX15.0v2.app" + ], + "linux": [ + "/usr/local/Nuke5.0v2/Nuke15.0" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{}", + "use_python_2": false + }, { "name": "14-0", "label": "14.0", "executables": { "windows": [ - "C:\\Program Files\\Nuke14.0v4\\Nuke14.0.exe" + "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" ], "darwin": [ - "/Applications/Nuke14.0v4/NukeX14.0v4.app" + "/Applications/Nuke14.0v5/NukeX14.0v5.app" ], "linux": [ - "/usr/local/Nuke14.0v4/Nuke14.0" + "/usr/local/Nuke14.0v5/Nuke14.0" ] }, "arguments": { - "windows": [ - "--nukex" - ], + "windows": [], "darwin": [], - "linux": [ - "--nukex" - ] + "linux": [] }, "environment": "{}", "use_python_2": false @@ -403,42 +425,12 @@ ] }, "arguments": { - "windows": [ - "--nukex" - ], + "windows": [], "darwin": [], - "linux": [ - "--nukex" - ] + "linux": [] }, "environment": "{}", "use_python_2": false - }, - { - "name": "13-0", - "label": "13.0", - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" - ], - "darwin": [ - "/Applications/Nuke13.0v1/NukeX13.0v1.app" - ], - "linux": [ - "/usr/local/Nuke13.0v1/Nuke13.0" - ] - }, - "arguments": { - "windows": [ - "--nukex" - ], - "darwin": [], - "linux": [ - "--nukex" - ] - }, - "environment": "{}" } ] }, @@ -449,28 +441,46 @@ "host_name": "hiero", "environment": "{\n \"WORKFILES_STARTUP\": \"0\",\n \"TAG_ASSETBUILD_STARTUP\": \"0\"\n}", "variants": [ + { + "name": "15-0", + "label": "15.0", + "executables": { + "windows": [ + "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" + ], + "darwin": [ + "/Applications/Nuke15.0v2/NukeStudio15.0v2.app" + ], + "linux": [ + "/usr/local/Nuke5.0v2/Nuke15.0" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{}", + "use_python_2": false + }, { "name": "14-0", "label": "14.0", "executables": { "windows": [ - "C:\\Program Files\\Nuke14.0v4\\Nuke14.0.exe" + "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" ], "darwin": [ - "/Applications/Nuke14.0v4/NukeStudio14.0v4.app" + "/Applications/Nuke14.0v5/NukeStudio14.0v5.app" ], "linux": [ - "/usr/local/Nuke14.0v4/Nuke14.0" + "/usr/local/Nuke14.0v5/Nuke14.0" ] }, "arguments": { - "windows": [ - "--studio" - ], + "windows": [], "darwin": [], - "linux": [ - "--studio" - ] + "linux": [] }, "environment": "{}", "use_python_2": false @@ -490,42 +500,12 @@ ] }, "arguments": { - "windows": [ - "--studio" - ], + "windows": [], "darwin": [], - "linux": [ - "--studio" - ] + "linux": [] }, "environment": "{}", "use_python_2": false - }, - { - "name": "13-0", - "label": "13.0", - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" - ], - "darwin": [ - "/Applications/Nuke13.0v1/NukeStudio13.0v1.app" - ], - "linux": [ - "/usr/local/Nuke13.0v1/Nuke13.0" - ] - }, - "arguments": { - "windows": [ - "--studio" - ], - "darwin": [], - "linux": [ - "--studio" - ] - }, - "environment": "{}" } ] }, @@ -536,28 +516,46 @@ "host_name": "hiero", "environment": "{\n \"WORKFILES_STARTUP\": \"0\",\n \"TAG_ASSETBUILD_STARTUP\": \"0\"\n}", "variants": [ + { + "name": "15-0", + "label": "15.0", + "executables": { + "windows": [ + "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" + ], + "darwin": [ + "/Applications/Nuke15.0v2/Hiero15.0v2.app" + ], + "linux": [ + "/usr/local/Nuke5.0v2/Nuke15.0" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{}", + "use_python_2": false + }, { "name": "14-0", "label": "14.0", "executables": { "windows": [ - "C:\\Program Files\\Nuke14.0v4\\Nuke14.0.exe" + "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" ], "darwin": [ - "/Applications/Nuke14.0v4/Hiero14.0v4.app" + "/Applications/Nuke14.0v5/Hiero14.0v5.app" ], "linux": [ - "/usr/local/Nuke14.0v4/Nuke14.0" + "/usr/local/Nuke14.0v5/Nuke14.0" ] }, "arguments": { - "windows": [ - "--hiero" - ], + "windows": [], "darwin": [], - "linux": [ - "--hiero" - ] + "linux": [] }, "environment": "{}", "use_python_2": false @@ -577,42 +575,12 @@ ] }, "arguments": { - "windows": [ - "--hiero" - ], + "windows": [], "darwin": [], - "linux": [ - "--hiero" - ] + "linux": [] }, "environment": "{}", "use_python_2": false - }, - { - "name": "13-0", - "label": "13.0", - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" - ], - "darwin": [ - "/Applications/Nuke13.0v1/Hiero13.0v1.app" - ], - "linux": [ - "/usr/local/Nuke13.0v1/Nuke13.0" - ] - }, - "arguments": { - "windows": [ - "--hiero" - ], - "darwin": [], - "linux": [ - "--hiero" - ] - }, - "environment": "{}" } ] }, @@ -623,6 +591,23 @@ "host_name": "fusion", "environment": "{\n \"FUSION_PYTHON3_HOME\": {\n \"windows\": \"{LOCALAPPDATA}/Programs/Python/Python36\",\n \"darwin\": \"~/Library/Python/3.6/bin\",\n \"linux\": \"/opt/Python/3.6/bin\"\n }\n}", "variants": [ + { + "name": "18", + "label": "18", + "executables": { + "windows": [ + "C:\\Program Files\\Blackmagic Design\\Fusion 18\\Fusion.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{}" + }, { "name": "17", "label": "17", @@ -656,23 +641,6 @@ "linux": [] }, "environment": "{}" - }, - { - "name": "9", - "label": "9", - "executables": { - "windows": [ - "C:\\Program Files\\Blackmagic Design\\Fusion 9\\Fusion.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": "{}" } ] }, @@ -710,11 +678,11 @@ "environment": "{}", "variants": [ { - "name": "18-5", - "label": "18.5", + "name": "19-5", + "label": "19.5", "executables": { "windows": [ - "C:\\Program Files\\Side Effects Software\\Houdini 18.5.499\\bin\\houdini.exe" + "C:\\Program Files\\Side Effects Software\\Houdini 19.5.805\\bin\\houdini.exe" ], "darwin": [], "linux": [] @@ -728,10 +696,12 @@ "use_python_2": true }, { - "name": "18", - "label": "18", + "name": "19-0", + "label": "19.0", "executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Side Effects Software\\Houdini 19.0.720\\bin\\houdini.exe" + ], "darwin": [], "linux": [] }, @@ -744,10 +714,12 @@ "use_python_2": true }, { - "name": "17", - "label": "17", + "name": "18-5", + "label": "18.5", "executables": { - "windows": [], + "windows": [ + "C:\\Program Files\\Side Effects Software\\Houdini 18.5.759\\bin\\houdini.exe" + ], "darwin": [], "linux": [] }, @@ -769,11 +741,11 @@ "environment": "{}", "variants": [ { - "name": "2-83", - "label": "2.83", + "name": "3-6-5", + "label": "3.6.5 LTS", "executables": { "windows": [ - "C:\\Program Files\\Blender Foundation\\Blender 2.83\\blender.exe" + "C:\\Program Files\\Blender Foundation\\Blender 3.6\\blender.exe" ], "darwin": [], "linux": [] @@ -846,6 +818,25 @@ "host_name": "harmony", "environment": "{\n \"AVALON_HARMONY_WORKFILES_ON_LAUNCH\": \"1\"\n}", "variants": [ + { + "name": "22", + "label": "22", + "executables": { + "windows": [ + "c:\\Program Files (x86)\\Toon Boom Animation\\Toon Boom Harmony 22 Premium\\win64\\bin\\HarmonyPremium.exe" + ], + "darwin": [ + "/Applications/Toon Boom Harmony 22 Premium/Harmony Premium.app/Contents/MacOS/Harmony Premium" + ], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{}" + }, { "name": "21", "label": "21", @@ -955,40 +946,6 @@ "host_name": "photoshop", "environment": "{\n \"AVALON_PHOTOSHOP_WORKFILES_ON_LAUNCH\": \"1\",\n \"WORKFILES_SAVE_AS\": \"Yes\"\n}", "variants": [ - { - "name": "2020", - "label": "2020", - "executables": { - "windows": [ - "C:\\Program Files\\Adobe\\Adobe Photoshop 2020\\Photoshop.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": "{}" - }, - { - "name": "2021", - "label": "2021", - "executables": { - "windows": [ - "C:\\Program Files\\Adobe\\Adobe Photoshop 2021\\Photoshop.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": "{}" - }, { "name": "2022", "label": "2022", @@ -1005,6 +962,40 @@ "linux": [] }, "environment": "{}" + }, + { + "name": "2023", + "label": "2023", + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe Photoshop 2023\\Photoshop.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{}" + }, + { + "name": "2024", + "label": "2024", + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe Photoshop 2024\\Photoshop.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{}" } ] }, @@ -1015,23 +1006,6 @@ "host_name": "aftereffects", "environment": "{\n \"AVALON_AFTEREFFECTS_WORKFILES_ON_LAUNCH\": \"1\",\n \"WORKFILES_SAVE_AS\": \"Yes\"\n}", "variants": [ - { - "name": "2020", - "label": "2020", - "executables": { - "windows": [ - "C:\\Program Files\\Adobe\\Adobe After Effects 2020\\Support Files\\AfterFX.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": "{}" - }, { "name": "2021", "label": "2021", @@ -1065,6 +1039,40 @@ "linux": [] }, "environment": "{\n \"MULTIPROCESS\": \"No\"\n}" + }, + { + "name": "2023", + "label": "2023", + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe After Effects 2023\\Support Files\\AfterFX.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{\n \"MULTIPROCESS\": \"No\"\n}" + }, + { + "name": "2024", + "label": "2024", + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe After Effects 2024\\Support Files\\AfterFX.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": "{\n \"MULTIPROCESS\": \"No\"\n}" } ] }, @@ -1100,8 +1108,8 @@ "environment": "{}", "variants": [ { - "name": "8-2-0", - "label": "8.2", + "name": "stable", + "label": "Stable", "executables": { "windows": [ "C:\\Program Files\\Adobe\\Adobe Substance 3D Painter\\Adobe Substance 3D Painter.exe" @@ -1119,16 +1127,48 @@ ] }, "unreal": { - "enabled": true, + "enabled": false, "label": "Unreal Editor", "icon": "{}/app_icons/ue4.png", "host_name": "unreal", "environment": "{}", "variants": [ { - "name": "4-26", - "label": "4.26", - "executables": {}, + "name": "5-0", + "label": "5.0", + "executables": { + "windows": [ + "C:\\Program Files\\Epic Games\\UE_5.0\\Engine\\Binaries\\Win64\\UnrealEditor.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": {}, + "environment": "{}" + }, + { + "name": "5-1", + "label": "5.1", + "executables": { + "windows": [ + "C:\\Program Files\\Epic Games\\UE_5.1\\Engine\\Binaries\\Win64\\UnrealEditor.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": {}, + "environment": "{}" + }, + { + "name": "5-2", + "label": "5.2", + "executables": { + "windows": [ + "C:\\Program Files\\Epic Games\\UE_5.2\\Engine\\Binaries\\Win64\\UnrealEditor.exe" + ], + "darwin": [], + "linux": [] + }, "arguments": {}, "environment": "{}" } diff --git a/server_addon/applications/server/settings.py b/server_addon/applications/server/settings.py index 224f999564..70c8b57c6a 100644 --- a/server_addon/applications/server/settings.py +++ b/server_addon/applications/server/settings.py @@ -199,5 +199,5 @@ class ApplicationsAddonSettings(BaseSettingsModel): DEFAULT_VALUES = { - "only_available": False + "only_available": True } diff --git a/server_addon/blender/server/settings/main.py b/server_addon/blender/server/settings/main.py index 5eff276ef5..3d53162e45 100644 --- a/server_addon/blender/server/settings/main.py +++ b/server_addon/blender/server/settings/main.py @@ -57,7 +57,7 @@ DEFAULT_VALUES = { "unit_scale_settings": { "enabled": True, "apply_on_opening": False, - "base_file_unit_scale": 0.01 + "base_file_unit_scale": 1.00 }, "set_frames_startup": True, "set_resolution_startup": True, diff --git a/server_addon/blender/server/settings/publish_plugins.py b/server_addon/blender/server/settings/publish_plugins.py index 7a5bc236d4..9a1e0c681e 100644 --- a/server_addon/blender/server/settings/publish_plugins.py +++ b/server_addon/blender/server/settings/publish_plugins.py @@ -142,7 +142,7 @@ class PublishPuginsModel(BaseSettingsModel): DEFAULT_BLENDER_PUBLISH_SETTINGS = { "ValidateCameraZeroKeyframe": { - "enabled": True, + "enabled": False, "optional": True, "active": True }, @@ -173,13 +173,13 @@ DEFAULT_BLENDER_PUBLISH_SETTINGS = { "active": True }, "ValidateTransformZero": { - "enabled": True, - "optional": False, + "enabled": False, + "optional": True, "active": True }, "ValidateNoColonsInName": { - "enabled": True, - "optional": False, + "enabled": False, + "optional": True, "active": True }, "ValidateInstanceEmpty": { @@ -201,9 +201,9 @@ DEFAULT_BLENDER_PUBLISH_SETTINGS = { ] }, "ExtractFBX": { - "enabled": True, + "enabled": False, "optional": True, - "active": False + "active": True }, "ExtractModelABC": { "enabled": True, @@ -216,9 +216,9 @@ DEFAULT_BLENDER_PUBLISH_SETTINGS = { "active": True }, "ExtractAnimationFBX": { - "enabled": True, + "enabled": False, "optional": True, - "active": False + "active": True }, "ExtractCamera": { "enabled": True, diff --git a/server_addon/maya/server/settings/main.py b/server_addon/maya/server/settings/main.py index c8021614be..55a079066c 100644 --- a/server_addon/maya/server/settings/main.py +++ b/server_addon/maya/server/settings/main.py @@ -101,7 +101,7 @@ DEFAULT_MEL_WORKSPACE_SETTINGS = "\n".join(( )) DEFAULT_MAYA_SETTING = { - "open_workfile_post_initialization": False, + "open_workfile_post_initialization": True, "explicit_plugins_loading": DEFAULT_EXPLITCIT_PLUGINS_LOADING_SETTINGS, "imageio": DEFAULT_IMAGEIO_SETTINGS, "mel_workspace": DEFAULT_MEL_WORKSPACE_SETTINGS, diff --git a/server_addon/maya/server/settings/publishers.py b/server_addon/maya/server/settings/publishers.py index dd8d4a0a37..e823efe681 100644 --- a/server_addon/maya/server/settings/publishers.py +++ b/server_addon/maya/server/settings/publishers.py @@ -785,7 +785,7 @@ DEFAULT_PUBLISH_SETTINGS = { "sync_workfile_version": False }, "CollectFbxAnimation": { - "enabled": True + "enabled": False }, "CollectFbxCamera": { "enabled": False @@ -862,7 +862,7 @@ DEFAULT_PUBLISH_SETTINGS = { ] }, "ValidatePluginPathAttributes": { - "enabled": True, + "enabled": False, "optional": False, "active": True, "attribute": [ @@ -917,12 +917,12 @@ DEFAULT_PUBLISH_SETTINGS = { "active": True }, "ValidateGLSLMaterial": { - "enabled": True, + "enabled": False, "optional": False, "active": True }, "ValidateGLSLPlugin": { - "enabled": True, + "enabled": False, "optional": False, "active": True }, @@ -1154,7 +1154,7 @@ DEFAULT_PUBLISH_SETTINGS = { "active": True }, "ExtractProxyAlembic": { - "enabled": True, + "enabled": False, "families": [ "proxyAbc" ] @@ -1311,7 +1311,7 @@ DEFAULT_PUBLISH_SETTINGS = { "bake_attributes": "[]" }, "ExtractGLB": { - "enabled": True, + "enabled": False, "active": True, "ogsfx_path": "/maya2glTF/PBR/shaders/glTF_PBR.ogsfx" }, diff --git a/server_addon/maya/server/settings/workfile_build_settings.py b/server_addon/maya/server/settings/workfile_build_settings.py index dc56d1a320..2c7fea85c4 100644 --- a/server_addon/maya/server/settings/workfile_build_settings.py +++ b/server_addon/maya/server/settings/workfile_build_settings.py @@ -104,7 +104,7 @@ DEFAULT_WORKFILE_SETTING = { { "product_name_filters": [], "product_types": [ - "sedress" + "setdress" ], "repre_names": [ "ma" diff --git a/server_addon/unreal/server/settings.py b/server_addon/unreal/server/settings.py index 479e041e25..110ccc563a 100644 --- a/server_addon/unreal/server/settings.py +++ b/server_addon/unreal/server/settings.py @@ -53,11 +53,11 @@ class UnrealSettings(BaseSettingsModel): DEFAULT_VALUES = { - "level_sequences_for_layouts": False, + "level_sequences_for_layouts": True, "delete_unmatched_assets": False, "render_config_path": "", "preroll_frames": 0, - "render_format": "png", + "render_format": "exr", "project_setup": { "dev_mode": False } From 79cd0e6991b80ee57f91489b28adb62b66b29352 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 6 Dec 2023 16:57:13 +0100 Subject: [PATCH 3/5] revert changes in OP --- .../defaults/project_anatomy/attributes.json | 12 +- .../defaults/project_anatomy/templates.json | 12 + .../defaults/project_settings/blender.json | 20 +- .../defaults/project_settings/maya.json | 18 +- .../defaults/project_settings/unreal.json | 4 +- .../system_settings/applications.json | 1196 ++++++++++------- .../defaults/system_settings/tools.json | 423 +----- 7 files changed, 824 insertions(+), 861 deletions(-) diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json index f388a9336b..0cc414fb69 100644 --- a/openpype/settings/defaults/project_anatomy/attributes.json +++ b/openpype/settings/defaults/project_anatomy/attributes.json @@ -10,8 +10,16 @@ "resolutionHeight": 1080, "pixelAspect": 1.0, "applications": [ - "maya/2024", - "nuke/14-0" + "maya/2020", + "nuke/12-2", + "nukex/12-2", + "hiero/12-2", + "resolve/stable", + "houdini/18-5", + "blender/2-91", + "harmony/20", + "photoshop/2021", + "aftereffects/2021" ], "tools_env": [], "active": true diff --git a/openpype/settings/defaults/project_anatomy/templates.json b/openpype/settings/defaults/project_anatomy/templates.json index 6c3e038d27..5766a09100 100644 --- a/openpype/settings/defaults/project_anatomy/templates.json +++ b/openpype/settings/defaults/project_anatomy/templates.json @@ -38,6 +38,16 @@ "file": "{subset}_{@version}<_{output}><.{@frame}>.{ext}", "path": "{@folder}/{@file}" }, + "simpleUnrealTextureHero": { + "folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/hero", + "file": "{originalBasename}.{ext}", + "path": "{@folder}/{@file}" + }, + "simpleUnrealTexture": { + "folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{@version}", + "file": "{originalBasename}_{@version}.{ext}", + "path": "{@folder}/{@file}" + }, "online": { "folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}", "file": "{originalBasename}<.{@frame}><_{udim}>.{ext}", @@ -58,6 +68,8 @@ }, "__dynamic_keys_labels__": { "maya2unreal": "Maya to Unreal", + "simpleUnrealTextureHero": "Simple Unreal Texture - Hero", + "simpleUnrealTexture": "Simple Unreal Texture", "online": "online", "tycache": "tycache", "source": "source", diff --git a/openpype/settings/defaults/project_settings/blender.json b/openpype/settings/defaults/project_settings/blender.json index 937d177d4a..385e97ef91 100644 --- a/openpype/settings/defaults/project_settings/blender.json +++ b/openpype/settings/defaults/project_settings/blender.json @@ -2,7 +2,7 @@ "unit_scale_settings": { "enabled": true, "apply_on_opening": false, - "base_file_unit_scale": 1.00 + "base_file_unit_scale": 0.01 }, "set_resolution_startup": true, "set_frames_startup": true, @@ -31,7 +31,7 @@ }, "publish": { "ValidateCameraZeroKeyframe": { - "enabled": false, + "enabled": true, "optional": true, "active": true }, @@ -62,13 +62,13 @@ "active": true }, "ValidateTransformZero": { - "enabled": false, - "optional": true, + "enabled": true, + "optional": false, "active": true }, "ValidateNoColonsInName": { - "enabled": false, - "optional": true, + "enabled": true, + "optional": false, "active": true }, "ValidateInstanceEmpty": { @@ -90,9 +90,9 @@ ] }, "ExtractFBX": { - "enabled": false, + "enabled": true, "optional": true, - "active": true + "active": false }, "ExtractModelABC": { "enabled": true, @@ -105,9 +105,9 @@ "active": true }, "ExtractAnimationFBX": { - "enabled": false, + "enabled": true, "optional": true, - "active": true + "active": false }, "ExtractCamera": { "enabled": true, diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 3ecefef4f9..7719a5e255 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -1,5 +1,5 @@ { - "open_workfile_post_initialization": true, + "open_workfile_post_initialization": false, "explicit_plugins_loading": { "enabled": false, "plugins_to_load": [ @@ -458,7 +458,7 @@ "per_task_type": [] }, "scriptsmenu": { - "name": "Custom Tools", + "name": "OpenPype Tools", "definition": [ { "type": "action", @@ -708,7 +708,7 @@ "sync_workfile_version": false }, "CollectFbxAnimation": { - "enabled": false + "enabled": true }, "CollectFbxCamera": { "enabled": false @@ -785,7 +785,7 @@ ] }, "ValidatePluginPathAttributes": { - "enabled": false, + "enabled": true, "optional": false, "active": true, "attribute": { @@ -840,12 +840,12 @@ "active": true }, "ValidateGLSLMaterial": { - "enabled": false, + "enabled": true, "optional": false, "active": true }, "ValidateGLSLPlugin": { - "enabled": false, + "enabled": true, "optional": false, "active": true }, @@ -1096,7 +1096,7 @@ "active": true }, "ExtractProxyAlembic": { - "enabled": false, + "enabled": true, "families": [ "proxyAbc" ] @@ -1383,7 +1383,7 @@ "keep_image_planes": false }, "ExtractGLB": { - "enabled": false, + "enabled": true, "active": true, "ogsfx_path": "/maya2glTF/PBR/shaders/glTF_PBR.ogsfx" }, @@ -1581,7 +1581,7 @@ { "subset_name_filters": [], "families": [ - "setdress" + "sedress" ], "repre_names": [ "ma" diff --git a/openpype/settings/defaults/project_settings/unreal.json b/openpype/settings/defaults/project_settings/unreal.json index dc7e4229aa..20e55c74f0 100644 --- a/openpype/settings/defaults/project_settings/unreal.json +++ b/openpype/settings/defaults/project_settings/unreal.json @@ -10,11 +10,11 @@ "rules": {} } }, - "level_sequences_for_layouts": true, + "level_sequences_for_layouts": false, "delete_unmatched_assets": false, "render_config_path": "", "preroll_frames": 0, - "render_format": "exr", + "render_format": "png", "project_setup": { "dev_mode": false } diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index 7dd767598e..a5283751e9 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -18,9 +18,7 @@ "windows": [ "C:\\Program Files\\Autodesk\\Maya2024\\bin\\maya.exe" ], - "darwin": [ - "/Applications/Autodesk/maya2024/Maya.app" - ], + "darwin": [], "linux": [ "/usr/autodesk/maya2024/bin/maya" ] @@ -40,9 +38,7 @@ "windows": [ "C:\\Program Files\\Autodesk\\Maya2023\\bin\\maya.exe" ], - "darwin": [ - "/Applications/Autodesk/maya2023/Maya.app" - ], + "darwin": [], "linux": [ "/usr/autodesk/maya2023/bin/maya" ] @@ -62,9 +58,7 @@ "windows": [ "C:\\Program Files\\Autodesk\\Maya2022\\bin\\maya.exe" ], - "darwin": [ - "/Applications/Autodesk/maya2022/Maya.app" - ], + "darwin": [], "linux": [ "/usr/autodesk/maya2022/bin/maya" ] @@ -163,24 +157,6 @@ "environment": { "3DSMAX_VERSION": "2023" } - }, - "2024": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Autodesk\\3ds Max 2024\\3dsmax.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "3DSMAX_VERSION": "2024" - } } } }, @@ -262,55 +238,13 @@ ] }, "variants": { - "15-0": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" - ], - "darwin": [ - "/Applications/Nuke15.0v2/Nuke15.0v2.app" - ], - "linux": [ - "/usr/local/Nuke15.0v2/Nuke15.0" - ] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, - "14-0": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" - ], - "darwin": [ - "/Applications/Nuke14.0v5/Nuke14.0v5.app" - ], - "linux": [ - "/usr/local/Nuke14.0v5/Nuke14.0" - ] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, "13-2": { "use_python_2": false, "executables": { "windows": [ "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" ], - "darwin": [ - "/Applications/Nuke13.2v1/Nuke13.2v1.app" - ], + "darwin": [], "linux": [ "/usr/local/Nuke13.2v1/Nuke13.2" ] @@ -322,17 +256,33 @@ }, "environment": {} }, + "13-0": { + "use_python_2": false, + "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": { "use_python_2": true, "executables": { "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" ], - "darwin": [ - "/Applications/Nuke12.2v3/Nuke12.2v3.app" - ], + "darwin": [], "linux": [ - "/usr/local/Nuke12.2v3/Nuke12.2" + "/usr/local/Nuke12.2v3Nuke12.2" ] }, "arguments": { @@ -342,11 +292,82 @@ }, "environment": {} }, + "12-0": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke12.0v1/Nuke12.0" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, + "11-3": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke11.3v5/Nuke11.3" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, + "11-2": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, + "11-0": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.0v4\\Nuke11.0.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, "__dynamic_keys_labels__": { - "15-0": "15.0", - "14-0": "14.0", "13-2": "13.2", - "12-2": "12.2" + "13-0": "13.0", + "12-2": "12.2", + "12-0": "12.0", + "11-3": "11.3", + "11-2": "11.2", + "11-0": "11.0" } } }, @@ -362,67 +383,13 @@ ] }, "variants": { - "15-0": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" - ], - "darwin": [ - "/Applications/Nuke15.0v2/Nuke15.0v2.app" - ], - "linux": [ - "/usr/local/Nuke15.0v2/Nuke15.0" - ] - }, - "arguments": { - "windows": [ - "--nukeassist" - ], - "darwin": [ - "--nukeassist" - ], - "linux": [ - "--nukeassist" - ] - }, - "environment": {} - }, - "14-0": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" - ], - "darwin": [ - "/Applications/Nuke14.0v5/Nuke14.0v5.app" - ], - "linux": [ - "/usr/local/Nuke14.0v5/Nuke14.0" - ] - }, - "arguments": { - "windows": [ - "--nukeassist" - ], - "darwin": [ - "--nukeassist" - ], - "linux": [ - "--nukeassist" - ] - }, - "environment": {} - }, "13-2": { "use_python_2": false, "executables": { "windows": [ "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" ], - "darwin": [ - "/Applications/Nuke13.2v1/Nuke13.2v1.app" - ], + "darwin": [], "linux": [ "/usr/local/Nuke13.2v1/Nuke13.2" ] @@ -440,17 +407,39 @@ }, "environment": {} }, + "13-0": { + "use_python_2": false, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.0v1/Nuke13.0" + ] + }, + "arguments": { + "windows": [ + "--nukeassist" + ], + "darwin": [ + "--nukeassist" + ], + "linux": [ + "--nukeassist" + ] + }, + "environment": {} + }, "12-2": { "use_python_2": true, "executables": { "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" ], - "darwin": [ - "/Applications/Nuke12.2v3/Nuke12.2v3.app" - ], + "darwin": [], "linux": [ - "/usr/local/Nuke12.2v3/Nuke12.2" + "/usr/local/Nuke12.2v3Nuke12.2" ] }, "arguments": { @@ -466,11 +455,83 @@ }, "environment": {} }, + "12-0": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke12.0v1/Nuke12.0" + ] + }, + "arguments": { + "windows": [ + "--nukeassist" + ], + "darwin": [ + "--nukeassist" + ], + "linux": [ + "--nukeassist" + ] + }, + "environment": {} + }, + "11-3": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke11.3v5/Nuke11.3" + ] + }, + "arguments": { + "windows": [ + "--nukeassist" + ], + "darwin": [ + "--nukeassist" + ], + "linux": [ + "--nukeassist" + ] + }, + "environment": {} + }, + "11-2": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [ + "--nukeassist" + ], + "darwin": [ + "--nukeassist" + ], + "linux": [ + "--nukeassist" + ] + }, + "environment": {} + }, "__dynamic_keys_labels__": { - "15-0": "15.0", - "14-0": "14.0", "13-2": "13.2", - "12-2": "12.2" + "13-0": "13.0", + "12-2": "12.2", + "12-0": "12.0", + "11-3": "11.3", + "11-2": "11.2" } } }, @@ -486,67 +547,13 @@ ] }, "variants": { - "15-0": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" - ], - "darwin": [ - "/Applications/Nuke15.0v2/Nuke15.0v2.app" - ], - "linux": [ - "/usr/local/Nuke15.0v2/Nuke15.0" - ] - }, - "arguments": { - "windows": [ - "--nukex" - ], - "darwin": [ - "--nukex" - ], - "linux": [ - "--nukex" - ] - }, - "environment": {} - }, - "14-0": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" - ], - "darwin": [ - "/Applications/Nuke14.0v5/Nuke14.0v5.app" - ], - "linux": [ - "/usr/local/Nuke14.0v5/Nuke14.0" - ] - }, - "arguments": { - "windows": [ - "--nukex" - ], - "darwin": [ - "--nukex" - ], - "linux": [ - "--nukex" - ] - }, - "environment": {} - }, "13-2": { "use_python_2": false, "executables": { "windows": [ "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" ], - "darwin": [ - "/Applications/Nuke13.2v1/Nuke13.2v1.app" - ], + "darwin": [], "linux": [ "/usr/local/Nuke13.2v1/Nuke13.2" ] @@ -564,17 +571,39 @@ }, "environment": {} }, + "13-0": { + "use_python_2": false, + "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": { "use_python_2": true, "executables": { "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" ], - "darwin": [ - "/Applications/Nuke12.2v3/Nuke12.2v3.app" - ], + "darwin": [], "linux": [ - "/usr/local/Nuke12.2v3/Nuke12.2" + "/usr/local/Nuke12.2v3Nuke12.2" ] }, "arguments": { @@ -590,11 +619,83 @@ }, "environment": {} }, + "12-0": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke12.0v1/Nuke12.0" + ] + }, + "arguments": { + "windows": [ + "--nukex" + ], + "darwin": [ + "--nukex" + ], + "linux": [ + "--nukex" + ] + }, + "environment": {} + }, + "11-3": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke11.3v5/Nuke11.3" + ] + }, + "arguments": { + "windows": [ + "--nukex" + ], + "darwin": [ + "--nukex" + ], + "linux": [ + "--nukex" + ] + }, + "environment": {} + }, + "11-2": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [ + "--nukex" + ], + "darwin": [ + "--nukex" + ], + "linux": [ + "--nukex" + ] + }, + "environment": {} + }, "__dynamic_keys_labels__": { - "15-0": "15.0", - "14-0": "14.0", "13-2": "13.2", - "12-2": "12.2" + "13-0": "13.0", + "12-2": "12.2", + "12-0": "12.0", + "11-3": "11.3", + "11-2": "11.2" } } }, @@ -608,67 +709,13 @@ "TAG_ASSETBUILD_STARTUP": "0" }, "variants": { - "15-0": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" - ], - "darwin": [ - "/Applications/Nuke15.0v2/Nuke15.0v2.app" - ], - "linux": [ - "/usr/local/Nuke15.0v2/Nuke15.0" - ] - }, - "arguments": { - "windows": [ - "--studio" - ], - "darwin": [ - "--studio" - ], - "linux": [ - "--studio" - ] - }, - "environment": {} - }, - "14-0": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" - ], - "darwin": [ - "/Applications/Nuke14.0v5/Nuke14.0v5.app" - ], - "linux": [ - "/usr/local/Nuke14.0v1/Nuke14.0" - ] - }, - "arguments": { - "windows": [ - "--studio" - ], - "darwin": [ - "--studio" - ], - "linux": [ - "--studio" - ] - }, - "environment": {} - }, "13-2": { "use_python_2": false, "executables": { "windows": [ "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" ], - "darwin": [ - "/Applications/Nuke13.2v1/Nuke13.2v1.app" - ], + "darwin": [], "linux": [ "/usr/local/Nuke13.2v1/Nuke13.2" ] @@ -686,17 +733,39 @@ }, "environment": {} }, + "13-0": { + "use_python_2": false, + "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": { "use_python_2": true, "executables": { "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" ], - "darwin": [ - "/Applications/Nuke12.2v3/Nuke12.2v3.app" - ], + "darwin": [], "linux": [ - "/usr/local/Nuke12.2v3/Nuke12.2" + "/usr/local/Nuke12.2v3Nuke12.2" ] }, "arguments": { @@ -712,11 +781,81 @@ }, "environment": {} }, + "12-0": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke12.0v1/Nuke12.0" + ] + }, + "arguments": { + "windows": [ + "--studio" + ], + "darwin": [ + "--studio" + ], + "linux": [ + "--studio" + ] + }, + "environment": {} + }, + "11-3": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke11.3v5/Nuke11.3" + ] + }, + "arguments": { + "windows": [ + "--studio" + ], + "darwin": [ + "--studio" + ], + "linux": [ + "--studio" + ] + }, + "environment": {} + }, + "11-2": { + "use_python_2": true, + "executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [ + "--studio" + ], + "darwin": [ + "--studio" + ], + "linux": [ + "--studio" + ] + }, + "environment": {} + }, "__dynamic_keys_labels__": { - "15-0": "15.0", - "14-0": "14.0", "13-2": "13.2", - "12-2": "12.2" + "13-0": "13.0", + "12-2": "12.2", + "12-0": "12.0", + "11-3": "11.3", + "11-2": "11.2" } } }, @@ -730,67 +869,13 @@ "TAG_ASSETBUILD_STARTUP": "0" }, "variants": { - "15-0": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke15.0v2\\Nuke15.0.exe" - ], - "darwin": [ - "/Applications/Nuke15.0v2/Nuke15.0v2.app" - ], - "linux": [ - "/usr/local/Nuke15.0v2/Nuke15.0" - ] - }, - "arguments": { - "windows": [ - "--hiero" - ], - "darwin": [ - "--hiero" - ], - "linux": [ - "--hiero" - ] - }, - "environment": {} - }, - "14-0": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Nuke14.0v5\\Nuke14.0.exe" - ], - "darwin": [ - "/Applications/Nuke14.0v5/Nuke14.0v5.app" - ], - "linux": [ - "/usr/local/Nuke14.0v5/Nuke14.0" - ] - }, - "arguments": { - "windows": [ - "--hiero" - ], - "darwin": [ - "--hiero" - ], - "linux": [ - "--hiero" - ] - }, - "environment": {} - }, "13-2": { "use_python_2": false, "executables": { "windows": [ "C:\\Program Files\\Nuke13.2v1\\Nuke13.2.exe" ], - "darwin": [ - "/Applications/Nuke13.2v1/Nuke13.2v1.app" - ], + "darwin": [], "linux": [ "/usr/local/Nuke13.2v1/Nuke13.2" ] @@ -808,17 +893,39 @@ }, "environment": {} }, + "13-0": { + "use_python_2": false, + "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": { "use_python_2": true, "executables": { "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" ], - "darwin": [ - "/Applications/Nuke12.2v3/Nuke12.2v3.app" - ], + "darwin": [], "linux": [ - "/usr/local/Nuke12.2v3/Nuke12.2" + "/usr/local/Nuke12.2v3Nuke12.2" ] }, "arguments": { @@ -834,11 +941,83 @@ }, "environment": {} }, + "12-0": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke12.0v1/Nuke12.0" + ] + }, + "arguments": { + "windows": [ + "--hiero" + ], + "darwin": [ + "--hiero" + ], + "linux": [ + "--hiero" + ] + }, + "environment": {} + }, + "11-3": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke11.3v5/Nuke11.3" + ] + }, + "arguments": { + "windows": [ + "--hiero" + ], + "darwin": [ + "--hiero" + ], + "linux": [ + "--hiero" + ] + }, + "environment": {} + }, + "11-2": { + "use_python_2": true, + "executables": { + "windows": [ + "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [ + "--hiero" + ], + "darwin": [ + "--hiero" + ], + "linux": [ + "--hiero" + ] + }, + "environment": {} + }, "__dynamic_keys_labels__": { - "15-0": "15.0", - "14-0": "14.0", "13-2": "13.2", - "12-2": "12.2" + "13-0": "13.0", + "12-2": "12.2", + "12-0": "12.0", + "11-3": "11.3", + "11-2": "11.2" } } }, @@ -884,6 +1063,36 @@ "linux": [] }, "environment": {} + }, + "16": { + "executables": { + "windows": [ + "C:\\Program Files\\Blackmagic Design\\Fusion 16\\Fusion.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, + "9": { + "executables": { + "windows": [ + "C:\\Program Files\\Blackmagic Design\\Fusion 9\\Fusion.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} } } }, @@ -928,41 +1137,11 @@ "host_name": "houdini", "environment": {}, "variants": { - "19-5-716": { + "18-5": { "use_python_2": true, "executables": { "windows": [ - "c:\\Program Files\\Side Effects Software\\Houdini 19.5.716\\bin\\houdini.exe" - ], - "darwin": [ - "/Applications/Houdini/Houdini19.5.716/Houdini.app" - ], - "linux": [ - "/opt/hfs19.5.716/bin/houdini" - ] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "HOUDINI_VERSION": "19.5.716" - } - } - } - }, - "blender": { - "enabled": true, - "label": "Blender", - "icon": "{}/app_icons/blender.png", - "host_name": "blender", - "environment": {}, - "variants": { - "3-6-5": { - "executables": { - "windows": [ - "C:\\Program Files\\Blender Foundation\\Blender 3.6\\blender.exe" + "C:\\Program Files\\Side Effects Software\\Houdini 18.5.499\\bin\\houdini.exe" ], "darwin": [], "linux": [] @@ -974,8 +1153,115 @@ }, "environment": {} }, + "18": { + "use_python_2": true, + "executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, + "17": { + "use_python_2": true, + "executables": { + "windows": [], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, "__dynamic_keys_labels__": { - "3-6-5": "3.6.5 LTS" + "18-5": "18.5", + "18": "18", + "17": "17" + } + } + }, + "blender": { + "enabled": true, + "label": "Blender", + "icon": "{}/app_icons/blender.png", + "host_name": "blender", + "environment": {}, + "variants": { + "2-83": { + "executables": { + "windows": [ + "C:\\Program Files\\Blender Foundation\\Blender 2.83\\blender.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [ + "--python-use-system-env" + ], + "darwin": [ + "--python-use-system-env" + ], + "linux": [ + "--python-use-system-env" + ] + }, + "environment": {} + }, + "2-90": { + "executables": { + "windows": [ + "C:\\Program Files\\Blender Foundation\\Blender 2.90\\blender.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [ + "--python-use-system-env" + ], + "darwin": [ + "--python-use-system-env" + ], + "linux": [ + "--python-use-system-env" + ] + }, + "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-91": "2.91" } } }, @@ -988,23 +1274,6 @@ "AVALON_HARMONY_WORKFILES_ON_LAUNCH": "1" }, "variants": { - "22": { - "executables": { - "windows": [ - "c:\\Program Files (x86)\\Toon Boom Animation\\Toon Boom Harmony 22 Premium\\win64\\bin\\HarmonyPremium.exe" - ], - "darwin": [ - "/Applications/Toon Boom Harmony 22 Premium/Harmony Premium.app/Contents/MacOS/Harmony Premium" - ], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, "21": { "executables": { "windows": [ @@ -1038,6 +1307,23 @@ "linux": [] }, "environment": {} + }, + "17": { + "executables": { + "windows": [ + "c:\\Program Files (x86)\\Toon Boom Animation\\Toon Boom Harmony 17 Premium\\win64\\bin\\HarmonyPremium.exe" + ], + "darwin": [ + "/Applications/Toon Boom Harmony 17 Premium/Harmony Premium.app/Contents/MacOS/Harmony Premium" + ], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} } } }, @@ -1094,50 +1380,44 @@ "WORKFILES_SAVE_AS": "Yes" }, "variants": { + "2020": { + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe Photoshop 2020\\Photoshop.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, + "2021": { + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe Photoshop 2021\\Photoshop.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, "2022": { "executables": { "windows": [ "C:\\Program Files\\Adobe\\Adobe Photoshop 2022\\Photoshop.exe" ], - "darwin": [ - "/Applications/Adobe Photoshop 2022/Adobe Photoshop 2022" - ], - "linux": [] - }, - "arguments": { - "windows": [], "darwin": [], "linux": [] }, - "environment": {} - }, - "2023": { - "executables": { - "windows": [ - "C:\\Program Files\\Adobe\\Adobe Photoshop 2023\\Photoshop.exe" - ], - "darwin": [ - "/Applications/Adobe Photoshop 2023/Adobe Photoshop 2023" - ], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, - "2024": { - "executables": { - "windows": [ - "C:\\Program Files\\Adobe\\Adobe Photoshop 2024\\Photoshop.exe" - ], - "darwin": [ - "/Applications/Adobe Photoshop 2024/Adobe Photoshop 2024" - ], - "linux": [] - }, "arguments": { "windows": [], "darwin": [], @@ -1157,54 +1437,44 @@ "WORKFILES_SAVE_AS": "Yes" }, "variants": { + "2020": { + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe After Effects 2020\\Support Files\\AfterFX.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, + "2021": { + "executables": { + "windows": [ + "C:\\Program Files\\Adobe\\Adobe After Effects 2021\\Support Files\\AfterFX.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, "2022": { "executables": { "windows": [ "C:\\Program Files\\Adobe\\Adobe After Effects 2022\\Support Files\\AfterFX.exe" ], - "darwin": [ - "/Applications/Adobe After Effects 2022/Adobe After Effects 2022" - ], - "linux": [] - }, - "arguments": { - "windows": [], "darwin": [], "linux": [] }, - "environment": { - "MULTIPROCESS": "No" - } - }, - "2023": { - "executables": { - "windows": [ - "C:\\Program Files\\Adobe\\Adobe After Effects 2023\\Support Files\\AfterFX.exe" - ], - "darwin": [ - "/Applications/Adobe After Effects 2023/Adobe After Effects 2023" - ], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "MULTIPROCESS": "No" - } - }, - "2024": { - "executables": { - "windows": [ - "C:\\Program Files\\Adobe\\Adobe After Effects 2024\\Support Files\\AfterFX.exe" - ], - "darwin": [ - "/Applications/Adobe After Effects 2024/Adobe After Effects 2024" - ], - "linux": [] - }, "arguments": { "windows": [], "darwin": [], @@ -1252,7 +1522,7 @@ "host_name": "substancepainter", "environment": {}, "variants": { - "stable": { + "8-2-0": { "executables": { "windows": [ "C:\\Program Files\\Adobe\\Adobe Substance 3D Painter\\Adobe Substance 3D Painter.exe" @@ -1266,6 +1536,9 @@ "linux": [] }, "environment": {} + }, + "__dynamic_keys_labels__": { + "8-2-0": "8.2.0" } } }, @@ -1310,26 +1583,9 @@ }, "environment": {} }, - "5-2": { - "use_python_2": false, - "executables": { - "windows": [ - "C:\\Program Files\\Epic Games\\UE_5.2\\Engine\\Binaries\\Win64\\UnrealEditor.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": {} - }, "__dynamic_keys_labels__": { - "5-0": "Unreal 5.0", "5-1": "Unreal 5.1", - "5-2": "Unreal 5.2" + "5-0": "Unreal 5.0" } } }, diff --git a/openpype/settings/defaults/system_settings/tools.json b/openpype/settings/defaults/system_settings/tools.json index 9e768b91e9..921e13af3a 100644 --- a/openpype/settings/defaults/system_settings/tools.json +++ b/openpype/settings/defaults/system_settings/tools.json @@ -1,403 +1,90 @@ { "tool_groups": { - "htoa": { - "environment": { - "HOUDINI_PATH": [ - "{STUDIO_SW}/APP/HTOA/{HTOA_VERSION}/HOUDINI{HOUDINI_VERSION}/WINDOWS/htoa-6.1.3.3_rdb15014_houdini-{HTOA_VERSION}", - "{HOUDINI_PATH}" - ], - "PATH": { - "windows": [ - "{STUDIO_SW}/APP/HTOA/{HTOA_VERSION}/HOUDINI{HOUDINI_VERSION}/WINDOWS/htoa-6.1.3.3_rdb15014_houdini-{HTOA_VERSION}/scripts/bin", - "{PATH}" - ] - } - }, - "variants": { - "5-4-2-7": { - "host_names": [ - "houdini" - ], - "app_variants": [], - "environment": { - "HTOA_VERSION": "5.4.2.7" - } - } - } - }, "mtoa": { "environment": { - "MTOA": { - "darwin": "{STUDIO_SW}/APP/MTOA/{MTOA_VERSION}/MAYA{MAYA_VERSION}/MAC", - "linux": "{STUDIO_SW}/APP/MTOA/{MTOA_VERSION}/MAYA{MAYA_VERSION}/LINUX", - "windows": "{STUDIO_SW}/APP/MTOA/{MTOA_VERSION}/MAYA{MAYA_VERSION}/WINDOWS" + "MTOA": "{STUDIO_SOFTWARE}/arnold/mtoa_{MAYA_VERSION}_{MTOA_VERSION}", + "MAYA_RENDER_DESC_PATH": "{MTOA}", + "MAYA_MODULE_PATH": "{MTOA}", + "ARNOLD_PLUGIN_PATH": "{MTOA}/shaders", + "MTOA_EXTENSIONS_PATH": { + "darwin": "{MTOA}/extensions", + "linux": "{MTOA}/extensions", + "windows": "{MTOA}/extensions" + }, + "MTOA_EXTENSIONS": { + "darwin": "{MTOA}/extensions", + "linux": "{MTOA}/extensions", + "windows": "{MTOA}/extensions" }, - "MAYA_MODULE_PATH": [ - "{STUDIO_SW}/APP/MTOA", - "{MAYA_MODULE_PATH}" - ], "DYLD_LIBRARY_PATH": { "darwin": "{MTOA}/bin" }, "PATH": { - "windows": [ - "{MTOA}/bin", - "{PATH}" - ] - }, - "XBMLANGPATH": [ - "{MTOA}/icons", - "{XBMLANGPATH}" - ], - "MAYA_RENDER_DESC_PATH": [ - "{MTOA}", - "{MAYA_RENDER_DESC_PATH}" - ], - "MTOA_STARTUP_LOG_VERBOSITY": "3" + "windows": "{PATH};{MTOA}/bin" + } }, "variants": { - "5-3-1-0": { - "host_names": [ - "maya" - ], + "3-2": { + "host_names": [], "app_variants": [], "environment": { - "MTOA_VERSION": "5.3.1.0" + "MTOA_VERSION": "3.2" } }, - "5-3-4-1": { - "host_names": [ - "maya" - ], + "3-1": { + "host_names": [], "app_variants": [], "environment": { - "MTOA_VERSION": "5.3.1.0" + "MTOA_VERSION": "3.1" } + }, + "__dynamic_keys_labels__": { + "3-2": "3.2", + "3-1": "3.1" } } }, - "rendermanMaya": { - "environment": { - "RFMTREE": { - "darwin": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/MAC/MAYA", - "linux": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/LINUX/MAYA", - "windows": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/WINDOWS/MAYA" - }, - "RMANTREE": { - "darwin": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/MAC/RenderManProServer-{RM_VERSION}", - "linux": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/LINUX/RenderManProServer-{RM_VERSION}", - "windows": "{STUDIO_SW}/APP/RENDERMAN/{RM_VERSION}/WINDOWS/RenderManProServer-{RM_VERSION}" - }, - "MAYA_MODULE_PATH": [ - "{STUDIO_SW}/APP/RENDERMAN", - "{MAYA_MODULE_PATH}" - ], - "PIXAR_LICENSE_FILE": "{STUDIO_SW}/APP/RENDERMAN/pixar.license", - "RFM_DO_NOT_CREATE_MODULE_FILE": "1" - }, + "vray": { + "environment": {}, + "variants": {} + }, + "yeti": { + "environment": {}, + "variants": {} + }, + "renderman": { + "environment": {}, "variants": { - "24-3": { + "24-3-maya": { "host_names": [ "maya" ], - "app_variants": [], + "app_variants": [ + "maya/2022" + ], "environment": { - "RM_VERSION": "24.3" + "RFMTREE": { + "windows": "C:\\Program Files\\Pixar\\RenderManForMaya-24.3", + "darwin": "/Applications/Pixar/RenderManForMaya-24.3", + "linux": "/opt/pixar/RenderManForMaya-24.3" + }, + "RMANTREE": { + "windows": "C:\\Program Files\\Pixar\\RenderManProServer-24.3", + "darwin": "/Applications/Pixar/RenderManProServer-24.3", + "linux": "/opt/pixar/RenderManProServer-24.3" + } } - } - } - }, - "yetiMaya": { - "environment": { - "YETI_HOME": { - "darwin": "{STUDIO_SW}/APP/YETI/{YETI_VERSION}/MAYA{MAYA_VERSION}/MAC", - "linux": "{STUDIO_SW}/APP/YETI/{YETI_VERSION}/MAYA{MAYA_VERSION}/LINUX", - "windows": "{STUDIO_SW}/APP/YETI/{YETI_VERSION}/MAYA{MAYA_VERSION}/WINDOWS" }, - "YETI_TMP": { - "windows": "C:/temp", - "darwin": "/tmp", - "linux": "/tmp" - }, - "peregrinel_LICENSE": "", - "MAYA_MODULE_PATH": [ - "{STUDIO_SW}/APP/YETI", - "{MAYA_MODULE_PATH}" - ] - }, - "variants": { - "4-2-11": { - "host_names": [ - "maya" - ], - "app_variants": [], - "environment": { - "YETI_VERSION": "4.2.11" - } - } - } - }, - "redshiftMaya": { - "environment": { - "REDSHIFT_COREDATAPATH": { - "darwin": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/MAC", - "linux": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/LINUX", - "windows": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/WINDOWS" - }, - "REDSHIFT_ABORTONLICENSEFAIL": "0", - "MAYA_MODULE_PATH": [ - "{STUDIO_SW}/APP/REDSHIFT", - "{MAYA_MODULE_PATH}" - ], - "MAYA_PLUG_IN_PATH": { - "windows": [ - "{REDSHIFT_COREDATAPATH}/Plugins/Maya/{MAYA_VERSION}/nt-x86-64", - "{MAYA_PLUG_IN_PATH}" - ], - "linux": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/{MAYA_VERSION}", - "{MAYA_PLUG_IN_PATH}" - ], - "darwin": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/{MAYA_VERSION}", - "{MAYA_PLUG_IN_PATH}" - ] - }, - "MAYA_SCRIPT_PATH": { - "windows": [ - "{REDSHIFT_COREDATAPATH}/Plugins/Maya/Common/scripts", - "{MAYA_SCRIPT_PATH}" - ], - "linux": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/common/scripts", - "{MAYA_SCRIPT_PATH}" - ], - "darwin": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/common/scripts", - "{MAYA_SCRIPT_PATH}" - ] - }, - "REDSHIFT_PROCEDURALSPATH": { - "windows": [ - "{REDSHIFT_COREDATAPATH}/Procedurals", - "{REDSHIFT_PROCEDURALSPATH}" - ], - "linux": [ - "{REDSHIFT_COREDATAPATH}/procedurals", - "{REDSHIFT_PROCEDURALSPATH}" - ], - "darwin": [ - "{REDSHIFT_COREDATAPATH}/procedurals", - "{REDSHIFT_PROCEDURALSPATH}" - ] - }, - "REDSHIFT_MAYAEXTENSIONSPATH": { - "windows": [ - "{REDSHIFT_COREDATAPATH}/Plugins/Maya/{MAYA_VERSION}/nt-x86-64/extensions", - "{REDSHIFT_MAYAEXTENSIONSPATH}" - ], - "linux": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/{MAYA_VERSION}/extensions", - "{REDSHIFT_MAYAEXTENSIONSPATH}" - ], - "darwin": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/{MAYA_VERSION}/extensions", - "{REDSHIFT_MAYAEXTENSIONSPATH}" - ] - }, - "XBMLANGPATH": { - "windows": [ - "{REDSHIFT_COREDATAPATH}/Plugins/Maya/Common/icons", - "{XBMLANGPATH}" - ], - "linux": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/common/icons", - "{XBMLANGPATH}" - ], - "darwin": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/common/icons", - "{XBMLANGPATH}" - ] - }, - "MAYA_RENDER_DESC_PATH": { - "windows": [ - "{REDSHIFT_COREDATAPATH}/Plugins/Maya/Common/rendererDesc", - "{MAYA_RENDER_DESC_PATH}" - ], - "linux": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/common/rendererDesc", - "{MAYA_RENDER_DESC_PATH}" - ], - "darwin": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/common/rendererDesc", - "{MAYA_RENDER_DESC_PATH}" - ] - }, - "MAYA_CUSTOM_TEMPLATE_PATH": { - "windows": [ - "{REDSHIFT_COREDATAPATH}/Plugins/Maya/Common/scripts/NETemplates", - "{MAYA_CUSTOM_TEMPLATE_PATH}" - ], - "linux": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/common/scripts/NETemplates", - "{MAYA_CUSTOM_TEMPLATE_PATH}" - ], - "darwin": [ - "{REDSHIFT_COREDATAPATH}/redshift4maya/common/scripts/NETemplates", - "{MAYA_CUSTOM_TEMPLATE_PATH}" - ] - }, - "PATH": { - "windows": [ - "{REDSHIFT_COREDATAPATH}/bin", - "{PATH}" - ] - } - }, - "variants": { - "3-5-19": { - "host_names": [ - "maya" - ], - "app_variants": [], - "environment": { - "REDSHIFT_VERSION": "3.5.19" - } - } - } - }, - "redshift3dsmax": { - "environment": { - "REDSHIFT_COREDATAPATH": { - "darwin": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/MAC", - "linux": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/LINUX", - "windows": "{STUDIO_SW}/APP/REDSHIFT/{REDSHIFT_VERSION}/WINDOWS" - }, - "REDSHIFT_ABORTONLICENSEFAIL": "0", - "REDSHIFT_PROCEDURALSPATH": { - "windows": [ - "{REDSHIFT_COREDATAPATH}/Procedurals", - "{REDSHIFT_PROCEDURALSPATH}" - ], - "linux": [ - "{REDSHIFT_COREDATAPATH}/procedurals", - "{REDSHIFT_PROCEDURALSPATH}" - ], - "darwin": [ - "{REDSHIFT_COREDATAPATH}/procedurals", - "{REDSHIFT_PROCEDURALSPATH}" - ] - }, - "PATH": { - "windows": [ - "{REDSHIFT_COREDATAPATH}/bin", - "{PATH}" - ] - } - }, - "variants": { - "3-5-19": { - "host_names": [ - "max" - ], - "app_variants": [], - "environment": { - "REDSHIFT_VERSION": "3.5.19" - } - } - } - }, - "mGear": { - "environment": { - "MGEAR_ROOT": "{STUDIO_SW}/APP/MGEAR/{MGEAR_VERSION}/MAYA{MAYA_VERSION}/windows/x64", - "MAYA_MODULE_PATH": [ - "{STUDIO_SW}/APP/MGEAR/{MGEAR_VERSION}/release", - "{MAYA_MODULE_PATH}" - ] - }, - "variants": { - "4-0-7": { - "host_names": [ - "maya" - ], - "app_variants": [], - "environment": { - "MGEAR_VERSION": "4.0.7" - } - } - } - }, - "vrayMaya": { - "environment": { - "MAYA_MODULE_PATH": { - "windows": [ - "{STUDIO_SW}/APP/VRAY/{VRAY_VERSION}/MAYA{MAYA_VERSION}/WINDOWS/maya_root/modules", - "{MAYA_MODULE_PATH}" - ], - "linux": [ - "{STUDIO_SW}/APP/VRAY/{VRAY_VERSION}/MAYA{MAYA_VERSION}/LINUX/maya_root/modules", - "{MAYA_MODULE_PATH}" - ], - "darwin": [ - "{STUDIO_SW}/APP/VRAY/{VRAY_VERSION}/MAYA{MAYA_VERSION}/MAC/maya_root/modules", - "{MAYA_MODULE_PATH}" - ] - }, - "VRAY_AUTH_CLIENT_FILE_PATH": "{STUDIO_SW}/APP/VRAY" - }, - "variants": { - "6-10-01": { - "host_names": [ - "maya" - ], - "app_variants": [], - "environment": { - "VRAY_VERSION": "6.10.01" - } - } - } - }, - "vraynuke": { - "environment": { - "VRAY_FOR_NUKE_13_0_PLUGINS": { - "windows": "{STUDIO_SW}/APP/VRAYNUKE/{VRAYNUKE_VERSION}/NUKE{NUKE_VRAY_VERSION}/WINDOWS/nuke_vray/plugins/vray" - }, - "NUKE_PATH": { - "windows": [ - "{STUDIO_SW}/APP/VRAYNUKE/{VRAYNUKE_VERSION}/NUKE{NUKE_VRAY_VERSION}/WINDOWS/nuke_root", - "{NUKE_PATH}" - ] - }, - "PATH": { - "windows": [ - "{STUDIO_SW}/APP/VRAYNUKE/{VRAYNUKE_VERSION}/NUKE{NUKE_VRAY_VERSION}/WINDOWS/nuke_vray", - "{PATH}" - ] - }, - "VRAY_AUTH_CLIENT_FILE_PATH": "{STUDIO_SW}/APP/VRAY" - }, - "variants": { - "5-20-00": { - "host_names": [ - "nuke" - ], - "app_variants": [], - "environment": { - "VRAYNUKE_VERSION": "5.20.00" - } + "__dynamic_keys_labels__": { + "24-3-maya": "24.3 RFM" } } }, "__dynamic_keys_labels__": { - "htoa": "Arnold for Houdini (example)", - "mtoa": "Arnold for Maya (example)", - "rendermanMaya": "Renderman for Maya (example)", - "yetiMaya": "Yeti for Maya (example)", - "redshiftMaya": "Redshift for Maya (example)", - "redshift3dsmax": "Redshift for 3dsmax (example)", - "mGear": "mGear for Maya (example)", - "vrayMaya": "Vray for Maya (example)", - "vraynuke": "Vray for Nuke (example)" + "mtoa": "Autodesk Arnold", + "vray": "Chaos Group Vray", + "yeti": "Peregrine Labs Yeti", + "renderman": "Pixar Renderman" } } } From 26de73ca1a18f5f37a450aa9aa6b27f5ec5e93f0 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 6 Dec 2023 17:12:44 +0100 Subject: [PATCH 4/5] typo --- server_addon/applications/server/applications.json | 1 + 1 file changed, 1 insertion(+) diff --git a/server_addon/applications/server/applications.json b/server_addon/applications/server/applications.json index 4a65d1cc1c..35f1b4cfbb 100644 --- a/server_addon/applications/server/applications.json +++ b/server_addon/applications/server/applications.json @@ -358,6 +358,7 @@ "environment": "{}", "use_python_2": false } + ] }, "nukex": { "enabled": true, From 8bcd4b793aa53ef8a8655a7b895ab93af9384ef4 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 6 Dec 2023 17:51:03 +0100 Subject: [PATCH 5/5] add studio SW example --- server_addon/core/server/settings/main.py | 2 +- server_addon/maya/server/settings/main.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server_addon/core/server/settings/main.py b/server_addon/core/server/settings/main.py index 433d0ef2f0..f9e572cbf9 100644 --- a/server_addon/core/server/settings/main.py +++ b/server_addon/core/server/settings/main.py @@ -198,7 +198,7 @@ DEFAULT_VALUES = { }, "studio_name": "", "studio_code": "", - "environments": "{}", + "environments": "{\n\"STUDIO_SW\": {\n \"darwin\": \"/mnt/REPO_SW\",\n \"linux\": \"/mnt/REPO_SW\",\n \"windows\": \"P:/REPO_SW\"\n }\n}", "tools": DEFAULT_TOOLS_VALUES, "version_start_category": { "profiles": [] diff --git a/server_addon/maya/server/settings/main.py b/server_addon/maya/server/settings/main.py index 55a079066c..62fd12ec8a 100644 --- a/server_addon/maya/server/settings/main.py +++ b/server_addon/maya/server/settings/main.py @@ -97,6 +97,7 @@ DEFAULT_MEL_WORKSPACE_SETTINGS = "\n".join(( 'workspace -fr "renderData" "renderData";', 'workspace -fr "sourceImages" "sourceimages";', 'workspace -fr "fileCache" "cache/nCache";', + 'workspace -fr "autoSave" "autosave"', '', ))