From dd27f4e839abe491d54b0183b58dc0dbbe16dc6a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 11 Aug 2023 16:23:27 +0200
Subject: [PATCH] AYON: Apply unknown ayon settings first (#5435)

* apply unknown ayon settings first

* added "Main" to empty default variants

* use 'default_variants' in aftereffects creator
---
 .../hosts/aftereffects/plugins/create/create_render.py    | 5 ++++-
 openpype/settings/ayon_settings.py                        | 8 ++++++++
 .../settings/defaults/project_settings/aftereffects.json  | 2 +-
 openpype/settings/defaults/project_settings/maya.json     | 4 +++-
 .../projects_schema/schema_project_aftereffects.json      | 2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/aftereffects/plugins/create/create_render.py b/openpype/hosts/aftereffects/plugins/create/create_render.py
index fa79fac78f..dcf424b44f 100644
--- a/openpype/hosts/aftereffects/plugins/create/create_render.py
+++ b/openpype/hosts/aftereffects/plugins/create/create_render.py
@@ -28,7 +28,6 @@ class RenderCreator(Creator):
     create_allow_context_change = True
 
     # Settings
-    default_variants = []
     mark_for_review = True
 
     def create(self, subset_name_from_ui, data, pre_create_data):
@@ -171,6 +170,10 @@ class RenderCreator(Creator):
         )
 
         self.mark_for_review = plugin_settings["mark_for_review"]
+        self.default_variants = plugin_settings.get(
+            "default_variants",
+            plugin_settings.get("defaults") or []
+        )
 
     def get_detail_description(self):
         return """Creator for Render instances
diff --git a/openpype/settings/ayon_settings.py b/openpype/settings/ayon_settings.py
index 6237756943..50abfe4839 100644
--- a/openpype/settings/ayon_settings.py
+++ b/openpype/settings/ayon_settings.py
@@ -301,6 +301,10 @@ def convert_system_settings(ayon_settings, default_settings, addon_versions):
     if "core" in ayon_settings:
         _convert_general(ayon_settings, output, default_settings)
 
+    for key, value in ayon_settings.items():
+        if key not in output:
+            output[key] = value
+
     for key, value in default_settings.items():
         if key not in output:
             output[key] = value
@@ -1272,6 +1276,10 @@ def convert_project_settings(ayon_settings, default_settings):
 
     _convert_global_project_settings(ayon_settings, output, default_settings)
 
+    for key, value in ayon_settings.items():
+        if key not in output:
+            output[key] = value
+
     for key, value in default_settings.items():
         if key not in output:
             output[key] = value
diff --git a/openpype/settings/defaults/project_settings/aftereffects.json b/openpype/settings/defaults/project_settings/aftereffects.json
index 63f544e536..77ccb74410 100644
--- a/openpype/settings/defaults/project_settings/aftereffects.json
+++ b/openpype/settings/defaults/project_settings/aftereffects.json
@@ -12,7 +12,7 @@
     },
     "create": {
         "RenderCreator": {
-            "defaults": [
+            "default_variants": [
                 "Main"
             ],
             "mark_for_review": true
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index d2fb7b0864..38f14ec022 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -547,7 +547,9 @@
         },
         "CreateUnrealSkeletalMesh": {
             "enabled": true,
-            "default_variants": [],
+            "default_variants": [
+                "Main"
+            ],
             "joint_hints": "jnt_org"
         },
         "CreateMultiverseLook": {
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_aftereffects.json b/openpype/settings/entities/schemas/projects_schema/schema_project_aftereffects.json
index 35b8fede86..72f09a641d 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_aftereffects.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_aftereffects.json
@@ -32,7 +32,7 @@
                     "children": [
                         {
                             "type": "list",
-                            "key": "defaults",
+                            "key": "default_variants",
                             "label": "Default Variants",
                             "object_type": "text",
                             "docstring": "Fill default variant(s) (like 'Main' or 'Default') used in subset name creation."