From 772af099e8d19f4a8771c7df4984c98e5c6e3dd3 Mon Sep 17 00:00:00 2001
From: kalisp <petr.kalis@gmail.com>
Date: Wed, 7 Feb 2024 17:37:23 +0100
Subject: [PATCH 1/2] OP-8130 - After Effects added flag to force values from
 Asset to composition during creation

This allows controlling setting of values (resolution, duration) from Asset (DB) to the created instance. Default is to set it automatically.
---
 openpype/hosts/aftereffects/plugins/create/create_render.py | 6 +++++-
 .../settings/defaults/project_settings/aftereffects.json    | 3 ++-
 .../projects_schema/schema_project_aftereffects.json        | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/aftereffects/plugins/create/create_render.py b/openpype/hosts/aftereffects/plugins/create/create_render.py
index fadfc0c2061..b4fb20f922c 100644
--- a/openpype/hosts/aftereffects/plugins/create/create_render.py
+++ b/openpype/hosts/aftereffects/plugins/create/create_render.py
@@ -29,6 +29,7 @@ class RenderCreator(Creator):
 
     # Settings
     mark_for_review = True
+    force_setting_values = True
 
     def create(self, subset_name_from_ui, data, pre_create_data):
         stub = api.get_stub()  # only after After Effects is up
@@ -96,7 +97,9 @@ def create(self, subset_name_from_ui, data, pre_create_data):
             self._add_instance_to_context(new_instance)
 
             stub.rename_item(comp.id, subset_name)
-            set_settings(True, True, [comp.id], print_msg=False)
+
+            if self.force_setting_values:
+                set_settings(True, True, [comp.id], print_msg=False)
 
     def get_pre_create_attr_defs(self):
         output = [
@@ -173,6 +176,7 @@ def apply_settings(self, project_settings):
         )
 
         self.mark_for_review = plugin_settings["mark_for_review"]
+        self.force_setting_values = plugin_settings["force_setting_values"]
         self.default_variants = plugin_settings.get(
             "default_variants",
             plugin_settings.get("defaults") or []
diff --git a/openpype/settings/defaults/project_settings/aftereffects.json b/openpype/settings/defaults/project_settings/aftereffects.json
index 77ccb744102..9e2ab7334b4 100644
--- a/openpype/settings/defaults/project_settings/aftereffects.json
+++ b/openpype/settings/defaults/project_settings/aftereffects.json
@@ -15,7 +15,8 @@
             "default_variants": [
                 "Main"
             ],
-            "mark_for_review": true
+            "mark_for_review": true,
+            "force_setting_values": true
         }
     },
     "publish": {
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 72f09a641de..b0f8a7357f9 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_aftereffects.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_aftereffects.json
@@ -42,6 +42,12 @@
                             "key": "mark_for_review",
                             "label": "Review",
                             "default": true
+                         },
+                        {
+                            "type": "boolean",
+                            "key": "force_setting_values",
+                            "label": "Force resolution and duration values from Asset",
+                            "default": true
                          }
                     ]
                 }

From 76ca2605c8475f5202359e0c7944cffdc90dcc00 Mon Sep 17 00:00:00 2001
From: kalisp <petr.kalis@gmail.com>
Date: Wed, 7 Feb 2024 17:40:17 +0100
Subject: [PATCH 2/2] OP-8130 - Ayon version of Settings for AE creator

---
 server_addon/aftereffects/server/settings/creator_plugins.py | 2 ++
 server_addon/aftereffects/server/version.py                  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/server_addon/aftereffects/server/settings/creator_plugins.py b/server_addon/aftereffects/server/settings/creator_plugins.py
index 988a0365897..5d4ba30cd0a 100644
--- a/server_addon/aftereffects/server/settings/creator_plugins.py
+++ b/server_addon/aftereffects/server/settings/creator_plugins.py
@@ -7,6 +7,8 @@ class CreateRenderPlugin(BaseSettingsModel):
         default_factory=list,
         title="Default Variants"
     )
+    force_setting_values: bool = SettingsField(
+        True, title="Force resolution and duration values from Asset")
 
 
 class AfterEffectsCreatorPlugins(BaseSettingsModel):
diff --git a/server_addon/aftereffects/server/version.py b/server_addon/aftereffects/server/version.py
index df0c92f1e27..e57ad007184 100644
--- a/server_addon/aftereffects/server/version.py
+++ b/server_addon/aftereffects/server/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring addon version."""
-__version__ = "0.1.2"
+__version__ = "0.1.3"