Skip to content

Commit

Permalink
Merge pull request #1052 from sagoyal2/iss_1050_hair_curves_in_blendl…
Browse files Browse the repository at this point in the history
…oader

Update BlendLoader.py to also transfer hair_curves
  • Loading branch information
cornerfarmer authored Feb 12, 2024
2 parents 867283f + b199e23 commit 84419bb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions blenderproc/python/loader/BlendLoader.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ 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', 'images', 'lights',
'materials', 'meshes', 'objects', 'textures']
Available options are: ['armatures', 'cameras', '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 @@ -101,8 +101,8 @@ def load_blend(path: str, obj_types: Optional[Union[List[str], str]] = None, nam
class _BlendLoader:
valid_data_blocks = [collection.lower() for collection in dir(bpy.data) if
isinstance(getattr(bpy.data, collection), bpy.types.bpy_prop_collection)]
valid_object_types = ['mesh', 'curve', 'surface', 'meta', 'font', 'hair', 'pointcloud', 'volume', 'gpencil',
'armature', 'lattice', 'empty', 'light', 'light_probe', 'camera', 'speaker']
valid_object_types = ['mesh', 'curve', 'curves', 'surface', 'meta', 'font', 'hair', 'pointcloud', 'volume',
'gpencil', 'armature', 'lattice', 'empty', 'light', 'light_probe', 'camera', 'speaker']

@staticmethod
def validate_and_standardizes_configured_list(config_value: Union[list, str], allowed_elements: list,
Expand Down

0 comments on commit 84419bb

Please sign in to comment.