Merge branch 'develop' into feature/OP-3926_gpu-cache

# Conflicts:
#	website/docs/admin_hosts_maya.md
This commit is contained in:
Toke Stuart Jepsen 2023-03-21 07:58:26 +00:00
commit 216c99d839
77 changed files with 2907 additions and 755 deletions

View file

@ -80,10 +80,12 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
order = pyblish.api.IntegratorOrder
families = ["workfile",
"pointcache",
"pointcloud",
"proxyAbc",
"camera",
"animation",
"model",
"maxScene",
"mayaAscii",
"mayaScene",
"setdress",