From 3dae06aa796db28b3f547b0c68102f9b3080f7b3 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 19 Feb 2021 10:50:09 +0100 Subject: [PATCH 1/4] fix yeti environments to store env group --- .../schemas/system_schema/tool_settings/schema_yeti.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pype/settings/entities/schemas/system_schema/tool_settings/schema_yeti.json b/pype/settings/entities/schemas/system_schema/tool_settings/schema_yeti.json index 96c6b624fc..34bb09da8d 100644 --- a/pype/settings/entities/schemas/system_schema/tool_settings/schema_yeti.json +++ b/pype/settings/entities/schemas/system_schema/tool_settings/schema_yeti.json @@ -13,7 +13,8 @@ { "key": "environment", "label": "Environment", - "type": "raw-json" + "type": "raw-json", + "env_group_key": "yeti" }, { "type": "schema_template", From 5b6d9ee9a6eb5355c8ccdf5c32bbdff99c6e5ff3 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 19 Feb 2021 10:50:25 +0100 Subject: [PATCH 2/4] fix vray environments to store env group --- .../schemas/system_schema/tool_settings/schema_vray.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pype/settings/entities/schemas/system_schema/tool_settings/schema_vray.json b/pype/settings/entities/schemas/system_schema/tool_settings/schema_vray.json index fdb25610e0..295b3ccac3 100644 --- a/pype/settings/entities/schemas/system_schema/tool_settings/schema_vray.json +++ b/pype/settings/entities/schemas/system_schema/tool_settings/schema_vray.json @@ -13,7 +13,8 @@ { "key": "environment", "label": "Environment", - "type": "raw-json" + "type": "raw-json", + "env_group_key": "vray" }, { "type": "schema_template", From 45dd7391b25faa575314496537c12bc433b06bcd Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 19 Feb 2021 10:55:58 +0100 Subject: [PATCH 3/4] added missing metadata in defaults --- pype/settings/defaults/system_settings/tools.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pype/settings/defaults/system_settings/tools.json b/pype/settings/defaults/system_settings/tools.json index 6f0b0a47db..af5772705c 100644 --- a/pype/settings/defaults/system_settings/tools.json +++ b/pype/settings/defaults/system_settings/tools.json @@ -56,12 +56,20 @@ }, "vray": { "enabled": true, - "environment": {}, + "environment": { + "__environment_keys__": { + "vray": [] + } + }, "variants": {} }, "yeti": { "enabled": true, - "environment": {}, + "environment": { + "__environment_keys__": { + "yeti": [] + } + }, "variants": {} }, "other": { From 94b32eb08f80e15a24e95b16501948448319d621 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 19 Feb 2021 10:56:15 +0100 Subject: [PATCH 4/4] fix saving of default system settings --- pype/settings/entities/root_entities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/settings/entities/root_entities.py b/pype/settings/entities/root_entities.py index 53cfbb5f3d..88b9da2428 100644 --- a/pype/settings/entities/root_entities.py +++ b/pype/settings/entities/root_entities.py @@ -494,7 +494,7 @@ class SystemSettings(RootEntity): Implementation of abstract method. """ - return DEFAULTS_DIR + return os.path.join(DEFAULTS_DIR, SYSTEM_SETTINGS_KEY) def _save_studio_values(self): settings_value = self.settings_value()