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

Merge branch 'develop' into release/3.15.x

Browse source 
# Conflicts:
#	openpype/hosts/photoshop/api/workio.py
#	openpype/hosts/photoshop/plugins/publish/validate_unique_subsets.py
#	pyproject.toml
#	website/docs/artist_hosts_aftereffects.md
This commit is contained in:
Jakub Trllo 2023-01-24 12:31:32 +01:00
commit b0a6be63ac
51 changed files with 920 additions and 800 deletions
Download patch file Download diff file Expand all files Collapse all files

7
openpype/plugins/publish/integrate.py
View file

@ -639,8 +639,13 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
# that `frameStart` index instead. Thus if that frame start
# differs from the collection we want to shift the destination
# frame indices from the source collection.
# In case source are published in place we need to
# skip renumbering
repre_frame_start = repre.get("frameStart")
if repre_frame_start is not None:
if (
"originalBasename" not in template
and repre_frame_start is not None
):
index_frame_start = int(repre["frameStart"])
# Shift destination sequence to the start frame
destination_indexes = [