Skip to content

Commit

Permalink
Adjust feedback from PR.
Browse files Browse the repository at this point in the history
  • Loading branch information
robin-ynput committed Sep 30, 2024
1 parent d0c69f6 commit 9e38605
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
1 change: 1 addition & 0 deletions client/ayon_resolve/api/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ def get(key):
self.product_type = get("productType") or self.product_type_default
self.vertical_sync = get("vSyncOn") or self.vertical_sync_default
self.hero_track = get("vSyncTrack") or self.driving_layer_default
self.hero_track = self.hero_track.replace(" ", "_")
self.review_media_track = (
get("reviewTrack") or self.review_track_default)

Expand Down
16 changes: 4 additions & 12 deletions client/ayon_resolve/plugins/create/create_shot_clip.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ def create(self, instance_data, _):
# Backwards compatible (Deprecated since 24/06/06)
"newAssetPublishing": True,
})
instance_data["folder"] = instance_data["folderPath"]

new_instance = CreatedInstance(
self.product_type, instance_data["productName"], instance_data, self
Expand Down Expand Up @@ -172,14 +173,7 @@ class ResolveShotInstanceCreator(_ResolveInstanceClipCreator):
label = "Editorial Shot"

def get_instance_attr_defs(self):
instance_attributes = [
TextDef(
"folderPath",
label="Folder path",
disabled=True,
)
]
instance_attributes.extend(CLIP_ATTR_DEFS)
instance_attributes = CLIP_ATTR_DEFS
return instance_attributes


Expand Down Expand Up @@ -453,6 +447,8 @@ def create(self, subset_name, instance_data, pre_create_data):
pre_create_data)

instance_data["clip_variant"] = pre_create_data["clip_variant"]
instance_data["task"] = None


if not self.timeline:
raise CreatorError(
Expand Down Expand Up @@ -561,7 +557,6 @@ def create(self, subset_name, instance_data, pre_create_data):
sub_instance_data["workfileFrameStart"]
sub_instance_data.update({
"creator_attributes": {
"folderPath": shot_folder_path,
"workfileFrameStart": workfileFrameStart,
"handleStart": sub_instance_data["handleStart"],
"handleEnd": sub_instance_data["handleEnd"],
Expand Down Expand Up @@ -654,9 +649,6 @@ def _handle_legacy_marker(self, tag_data, timeline_item, instances):
tag_data.update({
"task": self.create_context.get_current_task_name(),
"clip_index": item_unique_id,
"creator_attributes": {
"folderPath": tag_data["folder_path"]
},
})

# create parent shot
Expand Down

0 comments on commit 9e38605

Please sign in to comment.