From c38534fc1cf10ee0cbdec2acecc1d4932065602e Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Thu, 1 Apr 2021 22:23:25 +0200 Subject: [PATCH] fix all environments to use OPENPYPE_ROOT and openpype folder --- .../system_settings/applications.json | 42 +++++++++---------- .../defaults/system_settings/modules.json | 4 +- .../defaults/system_settings/tools.json | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index b21b035e38..e7c505f184 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -7,8 +7,8 @@ "environment": { "PYTHONPATH": [ "{OPENPYPE_ROOT}/pype/hosts/maya/startup", - "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/maya", - "{OPENPYPE_REPOS_ROOT}/maya-look-assigner", + "{OPENPYPE_ROOT}/repos/avalon-core/setup/maya", + "{OPENPYPE_ROOT}/repos/maya-look-assigner", "{PYTHONPATH}" ], "MAYA_DISABLE_CLIC_IPM": "Yes", @@ -91,8 +91,8 @@ "host_name": "maya", "environment": { "PYTHONPATH": [ - "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/maya", - "{OPENPYPE_REPOS_ROOT}/maya-look-assigner", + "{OPENPYPE_ROOT}/avalon-core/setup/maya", + "{OPENPYPE_ROOT}/maya-look-assigner", "{PYTHON_ENV}/python2/Lib/site-packages", "{PYTHONPATH}" ], @@ -171,8 +171,8 @@ "host_name": "nuke", "environment": { "NUKE_PATH": [ - "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/nuke/nuke_path", - "{OPENPYPE_ROOT}/pype/hosts/nuke/startup", + "{OPENPYPE_ROOT}/repos/avalon-core/setup/nuke/nuke_path", + "{OPENPYPE_ROOT}/openpype/hosts/nuke/startup", "{OPENPYPE_STUDIO_PLUGINS}/nuke" ], "PATH": { @@ -264,8 +264,8 @@ "host_name": "nuke", "environment": { "NUKE_PATH": [ - "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/nuke/nuke_path", - "{OPENPYPE_ROOT}/pype/hosts/nuke/startup", + "{OPENPYPE_ROOT}/repos/avalon-core/setup/nuke/nuke_path", + "{OPENPYPE_ROOT}/openpype/hosts/nuke/startup", "{OPENPYPE_STUDIO_PLUGINS}/nuke" ], "PATH": { @@ -381,7 +381,7 @@ "host_name": "hiero", "environment": { "HIERO_PLUGIN_PATH": [ - "{OPENPYPE_ROOT}/pype/hosts/hiero/startup" + "{OPENPYPE_ROOT}/openpype/hosts/hiero/startup" ], "PATH": { "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" @@ -496,7 +496,7 @@ "host_name": "hiero", "environment": { "HIERO_PLUGIN_PATH": [ - "{OPENPYPE_ROOT}/pype/hosts/hiero/startup" + "{OPENPYPE_ROOT}/openpype/hosts/hiero/startup" ], "PATH": { "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" @@ -709,7 +709,7 @@ "{PYTHON36_RESOLVE}/Scripts", "{PATH}" ], - "PRE_PYTHON_SCRIPT": "{OPENPYPE_ROOT}/pype/resolve/preload_console.py", + "PRE_PYTHON_SCRIPT": "{OPENPYPE_ROOT}/openpype/resolve/preload_console.py", "OPENPYPE_LOG_NO_COLORS": "True", "RESOLVE_DEV": "True" }, @@ -740,14 +740,14 @@ "host_name": "houdini", "environment": { "HOUDINI_PATH": { - "darwin": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&", - "linux": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&", - "windows": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup;&" + "darwin": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&", + "linux": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&", + "windows": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup;&" }, "HOUDINI_MENU_PATH": { - "darwin": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&", - "linux": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup:&", - "windows": "{OPENPYPE_ROOT}/pype/hosts/houdini/startup;&" + "darwin": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&", + "linux": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&", + "windows": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup;&" } }, "variants": { @@ -806,9 +806,9 @@ "icon": "{}/app_icons/blender.png", "host_name": "blender", "environment": { - "BLENDER_USER_SCRIPTS": "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/blender", + "BLENDER_USER_SCRIPTS": "{OPENPYPE_ROOT}/repos/avalon-core/setup/blender", "PYTHONPATH": [ - "{OPENPYPE_REPOS_ROOT}/avalon-core/setup/blender", + "{OPENPYPE_ROOT}/repos/avalon-core/setup/blender", "{PYTHONPATH}" ], "CREATE_NEW_CONSOLE": "yes" @@ -1053,7 +1053,7 @@ "icon": "app_icons/celaction.png", "host_name": "celaction", "environment": { - "CELACTION_TEMPLATE": "{OPENPYPE_ROOT}/pype/hosts/celaction/celaction_template_scene.scn" + "CELACTION_TEMPLATE": "{OPENPYPE_ROOT}/openpype/hosts/celaction/celaction_template_scene.scn" }, "variants": { "celation_Local": { @@ -1075,7 +1075,7 @@ "icon": "{}/app_icons/ue4.png'", "host_name": "unreal", "environment": { - "AVALON_UNREAL_PLUGIN": "{OPENPYPE_REPOS_ROOT}/avalon-unreal-integration", + "AVALON_UNREAL_PLUGIN": "{OPENPYPE_ROOT}/repos/avalon-unreal-integration", "OPENPYPE_LOG_NO_COLORS": "True", "QT_PREFERRED_BINDING": "PySide" }, diff --git a/openpype/settings/defaults/system_settings/modules.json b/openpype/settings/defaults/system_settings/modules.json index e285fce854..00e98aa8de 100644 --- a/openpype/settings/defaults/system_settings/modules.json +++ b/openpype/settings/defaults/system_settings/modules.json @@ -9,7 +9,7 @@ }, "ftrack": { "enabled": true, - "ftrack_server": "https://pype.ftrackapp.com", + "ftrack_server": "", "ftrack_actions_path": [], "ftrack_events_path": [], "intent": { @@ -131,7 +131,7 @@ }, "clockify": { "enabled": false, - "workspace_name": "studio name" + "workspace_name": "" }, "sync_server": { "enabled": false diff --git a/openpype/settings/defaults/system_settings/tools.json b/openpype/settings/defaults/system_settings/tools.json index 535d8d5fdb..b0adccc65e 100644 --- a/openpype/settings/defaults/system_settings/tools.json +++ b/openpype/settings/defaults/system_settings/tools.json @@ -2,7 +2,7 @@ "tool_groups": { "mtoa": { "environment": { - "MTOA": "{OPENPYPE_STUDIO_SOFTWARE}/arnold/mtoa_{MAYA_VERSION}_{MTOA_VERSION}", + "MTOA": "{STUDIO_SOFTWARE}/arnold/mtoa_{MAYA_VERSION}_{MTOA_VERSION}", "MAYA_RENDER_DESC_PATH": "{MTOA}", "MAYA_MODULE_PATH": "{MTOA}", "ARNOLD_PLUGIN_PATH": "{MTOA}/shaders",