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 feature/legacy_io_in_global_plugins

Browse source
This commit is contained in:
Jakub Trllo 2022-12-16 16:54:47 +01:00
commit eb5995777d
346 changed files with 6341 additions and 2478 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,6 +80,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
order = pyblish.api.IntegratorOrder
families = ["workfile",
"pointcache",
"proxyAbc",
"camera",
"animation",
"model",
@ -110,6 +111,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
"image",
"assembly",
"fbx",
"gltf",
"textures",
"action",
"harmony.template",
@ -768,7 +770,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
"time": context.data["time"],
"author": context.data["user"],
"source": source,
"comment": context.data.get("comment"),
"comment": instance.data["comment"],
"machine": context.data.get("machine"),
"fps": instance.data.get("fps", context.data.get("fps"))
}