blender/blender-addons
19
43
Fork 96
Code Issues 632 Pull Requests 27 Projects 1 Releases Wiki Activity

Import_3ds: Avoid any None in object lists #104785

Merged
Sebastian Sille merged 26 commits from :main into main 2023-07-27 18:46:27 +02:00
Conversation 0 Commits 26 Files Changed 2 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io_scene_3ds/__init__.py
View File

@ -74,7 +74,7 @@ class Import3DS(bpy.types.Operator, ImportHelper):
('CAMERA',"Camera".rjust(11),"",'CAMERA_DATA',0x8), ('CAMERA',"Camera".rjust(11),"",'CAMERA_DATA',0x8),
('EMPTY',"Empty".rjust(11),"",'EMPTY_DATA',0x10), ('EMPTY',"Empty".rjust(11),"",'EMPTY_DATA',0x10),
), ),
description="Object types to export", description="Object types to import",
default={'WORLD', 'MESH', 'LIGHT', 'CAMERA', 'EMPTY'}, default={'WORLD', 'MESH', 'LIGHT', 'CAMERA', 'EMPTY'},
) )
use_apply_transform: BoolProperty( use_apply_transform: BoolProperty(

2
io_scene_3ds/import_3ds.py
View File

@ -1049,7 +1049,7 @@ def process_next_chunk(context, file, previous_chunk, imported_objects, CONSTRAI
imported_objects.append(child) imported_objects.append(child)
else: else:
tracking = tracktype = None tracking = tracktype = None
if tracktype != 'TARGET' and tracking != 'AMBIENT': if child is not None and tracktype != 'TARGET' and tracking != 'AMBIENT':
object_dict[object_id] = child object_dict[object_id] = child
object_list.append(child) object_list.append(child)
object_parent.append(hierarchy) object_parent.append(hierarchy)