Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(loader): Preserves collection hierarchies when importing them from blend file #1149

Merged
merged 2 commits into from
Oct 22, 2024
Merged

fix(loader): Preserves collection hierarchies when importing them from blend file #1149

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8249b72
fix(loader): Preserves collection hierarchies when importing them fro…
cornerfarmer Sep 27, 2024
2a27979
chore(loader): Adds collections to blend loader docu
cornerfarmer Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions blenderproc/python/loader/BlendLoader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def load_blend(path: str, obj_types: Optional[Union[List[str], str]] = None, nam
stored in a .blend file's folders, see Blender's documentation for bpy.types.ID
for more info) names.
:param data_blocks: The data block or a list of data blocks which should be loaded from the given .blend file.
Available options are: ['armatures', 'cameras', 'curves', 'hairs', 'hair_curves', 'images',
Available options are: ['armatures', 'cameras', 'collections', 'curves', 'hairs', 'hair_curves', 'images',
'lights', 'materials', 'meshes', 'objects', 'textures']
:param link: whether to link instead of append data blocks from .blend file. Linked objects can not be modified.
:return: The list of loaded mesh objects.
Expand Down Expand Up @@ -65,8 +65,10 @@ def load_blend(path: str, obj_types: Optional[Union[List[str], str]] = None, nam
for obj in getattr(data_to, data_block):
# Check that the object type is desired
if obj.type.lower() in obj_types:
# Link objects to the scene
bpy.context.collection.objects.link(obj)
# If object does not yet belong to a imported collection
if len(obj.users_collection) == 0:
# Link objects to the scene collection
bpy.context.collection.objects.link(obj)
loaded_objects.append(convert_to_entity_subclass(obj))

# If a camera was imported
Expand All @@ -89,6 +91,17 @@ def load_blend(path: str, obj_types: Optional[Union[List[str], str]] = None, nam
# Remove object again if its type is not desired
bpy.data.objects.remove(obj, do_unlink=True)
print("Selected " + str(len(loaded_objects)) + " of the loaded objects by type")
elif data_block == "collections":
# Build up mapping of possible parent-child collection relationships
collection_parents = {}
for collection in getattr(data_to, data_block):
for child in collection.children:
collection_parents[child.name] = collection

# Add all collections to scene collection which do not yet belong to any other collection
for collection in getattr(data_to, data_block):
if collection.name not in collection_parents:
bpy.context.collection.children.link(collection)
else:
loaded_objects.extend(getattr(data_to, data_block))

Expand Down
Loading