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

Merge branch 'develop' into houdini_opengl

Browse source
This commit is contained in:
Roy Nieterau 2023-04-04 12:05:12 +02:00 • committed by GitHub
commit af7e4d035f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 508 additions and 432 deletions
Download patch file Download diff file Expand all files Collapse all files

19
openpype/plugins/publish/collect_context_entities.py
View file

@ -72,24 +72,9 @@ class CollectContextEntities(pyblish.api.ContextPlugin):
context.data["frameStart"] = frame_start
context.data["frameEnd"] = frame_end
handles = data.get("handles") or 0
handle_start = data.get("handleStart")
if handle_start is None:
handle_start = handles
self.log.info((
"Key \"handleStart\" is not set."
" Using value from \"handles\" key {}."
).format(handle_start))
handle_start = data.get("handleStart") or 0
handle_end = data.get("handleEnd") or 0
handle_end = data.get("handleEnd")
if handle_end is None:
handle_end = handles
self.log.info((
"Key \"handleEnd\" is not set."
" Using value from \"handles\" key {}."
).format(handle_end))
context.data["handles"] = int(handles)
context.data["handleStart"] = int(handle_start)
context.data["handleEnd"] = int(handle_end)

6
openpype/plugins/publish/extract_burnin.py
View file

@ -457,12 +457,6 @@ class ExtractBurnin(publish.Extractor):
frame_end = 1
frame_end = int(frame_end)
handles = instance.data.get("handles")
if handles is None:
handles = context.data.get("handles")
if handles is None:
handles = 0
handle_start = instance.data.get("handleStart")
if handle_start is None:
handle_start = context.data.get("handleStart")

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

@ -912,7 +912,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
# Include optional data if present in
optionals = [
"frameStart", "frameEnd", "step", "handles",
"frameStart", "frameEnd", "step",
"handleEnd", "handleStart", "sourceHashes"
]
for key in optionals:

2
openpype/plugins/publish/integrate_legacy.py
View file

@ -987,7 +987,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
# Include optional data if present in
optionals = [
"frameStart", "frameEnd", "step", "handles",
"frameStart", "frameEnd", "step",
"handleEnd", "handleStart", "sourceHashes"
]
for key in optionals: