Re-add collector to collect instance members

openpype/hosts/blender/plugins/publish/collect_instance.py

@@ -0,0 +1,43 @@
+import bpy
+
+import pyblish.api
+
+from openpype.pipeline.publish import KnownPublishError
+from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY
+
+
+class CollectBlenderInstanceData(pyblish.api.InstancePlugin):
+    """Validator to verify that the instance is not empty"""
+
+    order = pyblish.api.CollectorOrder
+    hosts = ["blender"]
+    families = ["model", "pointcache", "rig", "camera" "layout", "blendScene"]
+    label = "Collect Instance"
+
+    def process(self, instance):
+        instance_node = instance.data["transientData"]["instance_node"]
+
+        # Collect members of the instance
+        members = [instance_node]
+        if isinstance(instance_node, bpy.types.Collection):
+            members.extend(instance_node.objects)
+            members.extend(instance_node.children)
+
+            # Special case for animation instances, include armatures
+            # TODO: Does this still work as intended?
+            if instance.data["family"] == "animation":
+                for obj in instance_node.objects:
+                    if obj.type == 'EMPTY' and obj.get(AVALON_PROPERTY):
+                        members.extend(
+                            child for child in obj.children
+                            if child.type == 'ARMATURE'
+                        )
+        elif isinstance(instance_node, bpy.types.Object):
+            members.extend(instance_node.children_recursive)
+        else:
+            raise KnownPublishError(
+                f"Unsupported instance node type '{type(instance_node)}' "
+                f"for instance '{instance}'"
+            )
+
+        instance[:] = members