Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

flame: removing inherited mess

Browse source 
https://github.com/pypeclub/OpenPype/pull/2519#discussion_r785987192
This commit is contained in:
Jakub Jezek 2022-01-19 14:46:49 +01:00
parent ffc92fd1f4
commit 07b9a769e1
No known key found for this signature in database
GPG key ID: D8548FBF690B100A
2 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
openpype/hosts/flame/plugins/publish/precollect_instances.py
View file

@ -10,7 +10,7 @@ from pprint import pformat
class PrecollectInstances(pyblish.api.ContextPlugin):
"""Collect all Track items selection."""
order = pyblish.api.CollectorOrder - 0.49
order = pyblish.api.CollectorOrder - 0.47
label = "Precollect Instances"
hosts = ["flame"]
@ -57,16 +57,10 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
marker_data["handleEnd"] = min(
marker_data["handleEnd"], tail)
# add audio to families
with_audio = False
if marker_data.pop("audio"):
with_audio = True
with_audio = bool(marker_data.pop("audio"))
# add tag data to instance data
data = {
k: v for k, v in marker_data.items()
if k not in ("id", "applieswhole", "label")
}
# add marker data to instance data
inst_data = dict(marker_data.items())
asset = marker_data["asset"]
subset = marker_data["subset"]
@ -83,7 +77,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
label += " {}".format(subset)
label += " {}".format("[" + ", ".join(families) + "]")
data.update({
inst_data.update({
"name": "{}_{}".format(asset, subset),
"label": label,
"asset": asset,
@ -96,17 +90,19 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
"path": file_path
})
# otio clip data
# get otio clip data
otio_data = self._get_otio_clip_instance_data(clip_data) or {}
self.log.debug("__ otio_data: {}".format(pformat(otio_data)))
data.update(otio_data)
self.log.debug("__ data: {}".format(pformat(data)))
# add to instance data
inst_data.update(otio_data)
self.log.debug("__ inst_data: {}".format(pformat(inst_data)))
# add resolution
self._get_resolution_to_data(data, context)
self._get_resolution_to_data(inst_data, context)
# create instance
instance = context.create_instance(**data)
instance = context.create_instance(**inst_data)
# add colorspace data
instance.data.update({
@ -116,7 +112,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
})
# create shot instance for shot attributes create/update
self._create_shot_instance(context, clip_name, **data)
self._create_shot_instance(context, clip_name, **inst_data)
self.log.info("Creating instance: {}".format(instance))
self.log.info(

2
openpype/hosts/flame/plugins/publish/precollect_workfile.py
View file

@ -9,7 +9,7 @@ class PrecollecTimelineOCIO(pyblish.api.ContextPlugin):
"""Inject the current working context into publish context"""
label = "Precollect Timeline OTIO"
order = pyblish.api.CollectorOrder - 0.5
order = pyblish.api.CollectorOrder - 0.48
def process(self, context):
# plugin defined