Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed few merge issues

Browse source
This commit is contained in:
iLLiCiTiT 2020-02-17 17:05:08 +01:00
parent 4bec719932
commit 4256eccc2b
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pype/plugins/global/publish/integrate_new.py
View file

@ -196,6 +196,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
append_repres = instance.data.get("append", False)
# Update version data
# TODO query by _id and
io.update_many({
'type': 'version',
'parent': subset["_id"],
@ -322,7 +323,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
index_frame_start = None
if repre.get("frameStart"):
frame_start_padding = anatomy.templates["render"]["padding"]
frame_start_padding = (
anatomy.templates["render"]["padding"]
)
index_frame_start = int(repre.get("frameStart"))
# exception for slate workflow
@ -407,9 +410,10 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
# Use previous representation's id if there are any
repre_id = None
repre_name_low = repre["name"].lower()
for _repre in existing_repres:
# NOTE should we check lowered names?
if repre_name == _repre["name"]:
if repre_name_low == _repre["name"]:
repre_id = _repre["orig_id"]
break
@ -435,7 +439,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
representation["context"]["output"] = repre['outputName']
if sequence_repre and repre.get("frameStart"):
representation['context']['frame'] = src_padding_exp % int(repre.get("frameStart"))
representation['context']['frame'] = (
src_padding_exp % int(repre.get("frameStart"))
)
self.log.debug("__ representation: {}".format(representation))
destination_list.append(dst)