Merge pull request #2057 from pypeclub/bugfix/PYPE-1919_Hiero-Editori…

…al-fixes

openpype/hosts/hiero/otio/hiero_export.py

@@ -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()
@@ -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

openpype/hosts/hiero/plugins/publish/precollect_instances.py

@@ -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:

openpype/hosts/hiero/plugins/publish/precollect_workfile.py

@@ -8,6 +8,7 @@
 from Qt.QtGui import QPixmap
 import tempfile
 
+
 class PrecollectWorkfile(pyblish.api.ContextPlugin):
  """Inject the current working file into context"""
 

openpype/plugins/publish/collect_hierarchy.py

@@ -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"]
 

openpype/plugins/publish/collect_otio_frame_ranges.py

@@ -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"]
 

openpype/plugins/publish/collect_otio_review.py

@@ -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"]
 

openpype/plugins/publish/collect_otio_subset_resources.py

@@ -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"]