Merge develop

2026-01-02 00:44:52 +01:00 · 2022-12-12 10:27:40 +01:00 · 2022-12-12 10:27:40 +01:00 · 663538ceff
commit 663538ceff
parent 98f45c24a6 d221eff854
67 changed files with 2192 additions and 223 deletions
--- a/openpype/plugins/publish/integrate.py
+++ b/openpype/plugins/publish/integrate.py
@ -81,6 +81,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
    order = pyblish.api.IntegratorOrder
    families = ["workfile",
                "pointcache",
+                "proxyAbc",
                "camera",
                "animation",
                "model",
@ -111,6 +112,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
                "image",
                "assembly",
                "fbx",
+                "gltf",
                "textures",
                "action",
                "harmony.template",