From 1fcdde0a9cc3a8b31697540ce320286d83d30e99 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 8 Feb 2024 13:46:56 +0100
Subject: [PATCH] AfterEffects: added toggle for applying values from DB during
 creation (#6204)

* 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.

* OP-8130 - Ayon version of Settings for AE creator
---
 openpype/hosts/aftereffects/plugins/create/create_render.py | 6 +++++-
 .../settings/defaults/project_settings/aftereffects.json    | 3 ++-
 .../projects_schema/schema_project_aftereffects.json        | 6 ++++++
 .../aftereffects/server/settings/creator_plugins.py         | 2 ++
 server_addon/aftereffects/server/version.py                 | 2 +-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/aftereffects/plugins/create/create_render.py b/openpype/hosts/aftereffects/plugins/create/create_render.py
index fadfc0c206..b4fb20f922 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 @@ class RenderCreator(Creator):
             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 @@ class RenderCreator(Creator):
         )
 
         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 77ccb74410..9e2ab7334b 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 72f09a641d..b0f8a7357f 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
                          }
                     ]
                 }
diff --git a/server_addon/aftereffects/server/settings/creator_plugins.py b/server_addon/aftereffects/server/settings/creator_plugins.py
index 988a036589..5d4ba30cd0 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 df0c92f1e2..e57ad00718 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"