Unreal: animation, layout and setdress updates

pype/hosts/blender/plugin.py

@@ -7,7 +7,7 @@
 
 from avalon import api
 
-VALID_EXTENSIONS = [".blend"]
+VALID_EXTENSIONS = [".blend", ".json"]
 
 
 def asset_name(
@@ -29,15 +29,19 @@ def get_unique_number(
         c for c in bpy.data.collections
         if c.name == 'AVALON_CONTAINERS'
     ]
-    loaded_assets = []
+    containers = []
+    # First, add the children of avalon containers
     for c in avalon_containers:
-        loaded_assets.extend(c.children)
-    collections_names = [
-        c.name for c in loaded_assets
+        containers.extend(c.children)
+    # then keep looping to include all the children
+    for c in containers:
+        containers.extend(c.children)
+    container_names = [
+        c.name for c in containers
     ]
     count = 1
     name = f"{asset}_{count:0>2}_{subset}_CON"
-    while name in collections_names:
+    while name in container_names:
         count += 1
         name = f"{asset}_{count:0>2}_{subset}_CON"
     return f"{count:0>2}"
@@ -59,20 +63,20 @@ def create_blender_context(active: Optional[bpy.types.Object] = None,
     if not isinstance(selected, list):
         selected = [selected]
 
+    override_context = bpy.context.copy()
+
     for win in bpy.context.window_manager.windows:
         for area in win.screen.areas:
             if area.type == 'VIEW_3D':
                 for region in area.regions:
                     if region.type == 'WINDOW':
-                        override_context = {
-                            'window': win,
-                            'screen': win.screen,
-                            'area': area,
-                            'region': region,
-                            'scene': bpy.context.scene,
-                            'active_object': active,
-                            'selected_objects': selected
-                        }
+                        override_context['window'] = win
+                        override_context['screen'] = win.screen
+                        override_context['area'] = area
+                        override_context['region'] = region
+                        override_context['scene'] = bpy.context.scene
+                        override_context['active_object'] = active
+                        override_context['selected_objects'] = selected
                         return override_context
     raise Exception("Could not create a custom Blender context.")
 
@@ -175,33 +179,42 @@ def load(self,
         # just re-using the collection
         assert Path(self.fname).exists(), f"{self.fname} doesn't exist."
 
-        self.process_asset(
+        asset = context["asset"]["name"]
+        subset = context["subset"]["name"]
+        unique_number = get_unique_number(
+            asset, subset
+        )
+        namespace = namespace or f"{asset}_{unique_number}"
+        name = name or asset_name(
+            asset, subset, unique_number
+        )
+
+        nodes = self.process_asset(
             context=context,
             name=name,
             namespace=namespace,
             options=options,
         )
 
         # Only containerise if anything was loaded by the Loader.
-        nodes = self[:]
         if not nodes:
             return None
 
         # Only containerise if it's not already a collection from a .blend file.
-        representation = context["representation"]["name"]
-        if representation != "blend":
-            from avalon.blender.pipeline import containerise
-            return containerise(
-                name=name,
-                namespace=namespace,
-                nodes=nodes,
-                context=context,
-                loader=self.__class__.__name__,
-            )
+        # representation = context["representation"]["name"]
+        # if representation != "blend":
+        #     from avalon.blender.pipeline import containerise
+        #     return containerise(
+        #         name=name,
+        #         namespace=namespace,
+        #         nodes=nodes,
+        #         context=context,
+        #         loader=self.__class__.__name__,
+        #     )
 
         asset = context["asset"]["name"]
         subset = context["subset"]["name"]
-        instance_name = asset_name(asset, subset, namespace)
+        instance_name = asset_name(asset, subset, unique_number) + '_CON'
 
         return self._get_instance_collection(instance_name, nodes)
 

pype/plugins/blender/create/create_animation.py

@@ -2,12 +2,11 @@
 
 import bpy
 
-from avalon import api
-from avalon.blender import Creator, lib
+from avalon import api, blender
 import pype.hosts.blender.plugin
 
 
-class CreateAnimation(Creator):
+class CreateAnimation(blender.Creator):
     """Animation output for character rigs"""
 
     name = "animationMain"
@@ -16,37 +15,16 @@ class CreateAnimation(Creator):
     icon = "male"
 
     def process(self):
-
         asset = self.data["asset"]
         subset = self.data["subset"]
         name = pype.hosts.blender.plugin.asset_name(asset, subset)
         collection = bpy.data.collections.new(name=name)
         bpy.context.scene.collection.children.link(collection)
         self.data['task'] = api.Session.get('AVALON_TASK')
-        lib.imprint(collection, self.data)
-
-        # Add the rig object and all the children meshes to
-        # a set and link them all at the end to avoid duplicates.
-        # Blender crashes if trying to link an object that is already linked.
-        # This links automatically the children meshes if they were not
-        # selected, and doesn't link them twice if they, insted,
-        # were manually selected by the user.
-        objects_to_link = set()
+        blender.lib.imprint(collection, self.data)
 
         if (self.options or {}).get("useSelection"):
-
-            for obj in lib.get_selection():
-
-                objects_to_link.add(obj)
-
-                if obj.type == 'ARMATURE':
-
-                    for subobj in obj.children:
-
-                        objects_to_link.add(subobj)
-
-        for obj in objects_to_link:
-
-            collection.objects.link(obj)
+            for obj in blender.lib.get_selection():
+                collection.objects.link(obj)
 
         return collection

pype/plugins/blender/create/create_setdress.py

@@ -0,0 +1,24 @@
+import bpy
+
+from avalon import api, blender
+import pype.hosts.blender.plugin
+
+class CreateSetDress(blender.Creator):
+    """A grouped package of loaded content"""
+
+    name = "setdressMain"
+    label = "Set Dress"
+    family = "setdress"
+    icon = "cubes"
+    defaults = ["Main", "Anim"]
+
+    def process(self):
+        asset = self.data["asset"]
+        subset = self.data["subset"]
+        name = pype.hosts.blender.plugin.asset_name(asset, subset)
+        collection = bpy.data.collections.new(name=name)
+        bpy.context.scene.collection.children.link(collection)
+        self.data['task'] = api.Session.get('AVALON_TASK')
+        blender.lib.imprint(collection, self.data)
+
+        return collection