From 4418d1116477add6da68e33abeca492c669bba73 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Thu, 19 Oct 2023 11:18:59 +0100
Subject: [PATCH] Code improvements from suggestions

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 .../hosts/blender/plugins/load/load_abc.py    | 21 +++++++------------
 .../plugins/publish/collect_instances.py      |  2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/openpype/hosts/blender/plugins/load/load_abc.py b/openpype/hosts/blender/plugins/load/load_abc.py
index 531a820436..af28cff7fe 100644
--- a/openpype/hosts/blender/plugins/load/load_abc.py
+++ b/openpype/hosts/blender/plugins/load/load_abc.py
@@ -60,19 +60,14 @@ class CacheModelLoader(plugin.AssetLoader):
 
         imported = lib.get_selection()
 
-        empties = [obj for obj in imported if obj.type == 'EMPTY']
-
-        container = None
-
-        for empty in empties:
-            if not empty.parent:
-                container = empty
-                break
+        # Use first EMPTY without parent as container
+        container = next(
+            (obj for obj in imported if obj.type == "EMPTY" and not obj.parent),
+            None
+        )
 
         objects = []
         if container:
-            # Children must be linked before parents,
-            # otherwise the hierarchy will break
             nodes = list(container.children)
 
             for obj in nodes:
@@ -80,11 +75,9 @@ class CacheModelLoader(plugin.AssetLoader):
 
             bpy.data.objects.remove(container)
 
+            objects.extend(nodes)
             for obj in nodes:
-                objects.append(obj)
-                objects.extend(list(obj.children_recursive))
-
-            objects.reverse()
+                objects.extend(obj.children_recursive)
         else:
             for obj in imported:
                 obj.parent = asset_group
diff --git a/openpype/hosts/blender/plugins/publish/collect_instances.py b/openpype/hosts/blender/plugins/publish/collect_instances.py
index c95d718187..ad2ce54147 100644
--- a/openpype/hosts/blender/plugins/publish/collect_instances.py
+++ b/openpype/hosts/blender/plugins/publish/collect_instances.py
@@ -51,7 +51,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
         for group in asset_groups:
             instance = self.create_instance(context, group)
             members = []
-            if type(group) == bpy.types.Collection:
+            if isinstance(group, bpy.types.Collection):
                 members = list(group.objects)
                 family = instance.data["family"]
                 if family == "animation":