Merge branch 'develop' into enhancement/support_free_version

Author: rdelillo

client/ayon_resolve/plugins/create/create_shot_clip.py

@@ -170,6 +170,14 @@ class ResolveShotInstanceCreator(_ResolveInstanceClipCreator):
 
     def get_instance_attr_defs(self):
         instance_attributes = CLIP_ATTR_DEFS
+        instance_attributes.append(
+            BoolDef(
+                "useSourceResolution",
+                label="Set shot resolution from plate",
+                tooltip="Is resolution taken from timeline or source?",
+                default=False,
+            )
+        )
         return instance_attributes
 
 
@@ -637,7 +645,8 @@ def create(self, subset_name, instance_data, pre_create_data):
                         "clipDuration": track_item_duration,
                         "sourceIn": track_item.GetLeftOffset(),
                         "sourceOut": (track_item.GetLeftOffset() +
-                            track_item_duration)
+                            track_item_duration),
+                        "useSourceResolution": sub_instance_data["sourceResolution"],
                     })
 
                 # Plate, Audio
@@ -718,6 +727,27 @@ def _create_and_add_instance(self, data, creator_id,
             CreatedInstance: The newly created instance.
         """
         creator = self.create_context.creators[creator_id]
+
+        if creator_id == "io.ayon.creators.resolve.shot":
+            track_item_duration = timeline_item.GetDuration()
+            workfileFrameStart = data["workfileFrameStart"]
+            creator_attributes = {
+                "workfileFrameStart": workfileFrameStart,
+                "handleStart": data["handleStart"],
+                "handleEnd": data["handleEnd"],
+                "frameStart": workfileFrameStart,
+                "frameEnd": (workfileFrameStart +
+                    track_item_duration),
+                "clipIn": timeline_item.GetStart(),
+                "clipOut": timeline_item.GetEnd(),
+                "clipDuration": track_item_duration,
+                "sourceIn": timeline_item.GetLeftOffset(),
+                "sourceOut": (timeline_item.GetLeftOffset() +
+                    track_item_duration),
+                "useSourceResolution": data["sourceResolution"],
+            }
+            data["creator_attributes"] = creator_attributes
+
         instance = creator.create(data, None)
         instance.transient_data["track_item"] = timeline_item
         self._add_instance_to_context(instance)
@@ -754,7 +784,7 @@ def _handle_legacy_marker(self, tag_data, timeline_item, instances):
             "clip_variant": tag_data["variant"],
             "creator_attributes": {
                 "parentInstance": inst["label"],
-            }            
+            }
         })
         inst = self._create_and_add_instance(
             plate_data, creator_id, timeline_item, instances)

client/ayon_resolve/plugins/publish/collect_shots.py

@@ -71,8 +71,9 @@ def process(self, instance):
         creator_id = instance.data["creator_identifier"]
         inst_data = marker.metadata["resolve_sub_products"].get(creator_id, {})
 
-        # Overwrite settings with clip metadata is "sourceResolution"
-        overwrite_clip_metadata = inst_data.get("sourceResolution", False)
+        # Overwrite settings with clip metadata is "useSourceResolution"
+        creator_attributes = instance.data["creator_attributes"]
+        overwrite_clip_metadata = creator_attributes.get("useSourceResolution", False)
         if overwrite_clip_metadata:
             clip_metadata = inst_data["clip_source_resolution"]
             width = clip_metadata["width"]