Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Hiero: Editorial fixes #2057

Merged
merged 3 commits into from
Sep 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions openpype/hosts/hiero/otio/hiero_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,17 @@ def add_otio_metadata(otio_item, media_source, **kwargs):

def create_otio_timeline():

def set_prev_item(itemindex, track_item):
# Add Gap if needed
if itemindex == 0:
# if it is first track item at track then add
# it to previouse item
return track_item

else:
# get previouse item
return track_item.parent().items()[itemindex - 1]

# get current timeline
self.timeline = hiero.ui.activeSequence()
self.project_fps = self.timeline.framerate().toFloat()
Expand All @@ -396,14 +407,6 @@ def create_otio_timeline():
type(track), track.name())

for itemindex, track_item in enumerate(track):
# skip offline track items
if not track_item.isMediaPresent():
continue

# skip if track item is disabled
if not track_item.isEnabled():
continue

# Add Gap if needed
if itemindex == 0:
# if it is first track item at track then add
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def process(self, context):
self.create_shot_instance(context, **data)

self.log.info("Creating instance: {}".format(instance))
self.log.debug(
self.log.info(
"_ instance.data: {}".format(pformat(instance.data)))

if not with_audio:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from Qt.QtGui import QPixmap
import tempfile


class PrecollectWorkfile(pyblish.api.ContextPlugin):
"""Inject the current working file into context"""

Expand Down
2 changes: 1 addition & 1 deletion openpype/plugins/publish/collect_hierarchy.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class CollectHierarchy(pyblish.api.ContextPlugin):
"""

label = "Collect Hierarchy"
order = pyblish.api.CollectorOrder - 0.57
order = pyblish.api.CollectorOrder - 0.47
families = ["shot"]
hosts = ["resolve", "hiero"]

Expand Down
2 changes: 1 addition & 1 deletion openpype/plugins/publish/collect_otio_frame_ranges.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class CollectOcioFrameRanges(pyblish.api.InstancePlugin):
Adding timeline and source ranges to instance data"""

label = "Collect OTIO Frame Ranges"
order = pyblish.api.CollectorOrder - 0.58
order = pyblish.api.CollectorOrder - 0.48
families = ["shot", "clip"]
hosts = ["resolve", "hiero"]

Expand Down
2 changes: 1 addition & 1 deletion openpype/plugins/publish/collect_otio_review.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class CollectOcioReview(pyblish.api.InstancePlugin):
"""Get matching otio track from defined review layer"""

label = "Collect OTIO Review"
order = pyblish.api.CollectorOrder - 0.57
order = pyblish.api.CollectorOrder - 0.47
families = ["clip"]
hosts = ["resolve", "hiero"]

Expand Down
2 changes: 1 addition & 1 deletion openpype/plugins/publish/collect_otio_subset_resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class CollectOcioSubsetResources(pyblish.api.InstancePlugin):
"""Get Resources for a subset version"""

label = "Collect OTIO Subset Resources"
order = pyblish.api.CollectorOrder - 0.57
order = pyblish.api.CollectorOrder - 0.47
families = ["clip"]
hosts = ["resolve", "hiero"]

Expand Down