diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2018-11-16 16:43:53 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2018-11-16 16:43:53 +0300 |
| commit | 64198b8817042962dcdedc71bb81ee9492b19a4d (patch) | |
| tree | 12254b62ee4019fb103cb07f31a318661a29aec8 /io_scene_3ds | |
| parent | 88b34670b8c6601032db7bb7b546b89d30e6f793 (diff) | |
| parent | 92ebf635ee2a9ddbc7fbf4a0c06b9732ee555b27 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'io_scene_3ds')
| -rw-r--r-- | io_scene_3ds/import_3ds.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/io_scene_3ds/import_3ds.py b/io_scene_3ds/import_3ds.py index cf17edcd..28d7b25f 100644 --- a/io_scene_3ds/import_3ds.py +++ b/io_scene_3ds/import_3ds.py @@ -828,7 +828,10 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH): ob.parent = None else: if ob.parent != object_list[parent]: - ob.parent = object_list[parent] + if ob == object_list[parent]: + print(' warning: Cannot assign self to parent ', ob) + else: + ob.parent = object_list[parent] # pivot_list[ind] += pivot_list[parent] # XXX, not sure this is correct, should parent space matrix be applied before combining? # fix pivots |