From 9f73e32d3c37d67f898c6d5e96eaac984785c966 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 23 Mar 2011 09:42:53 +0000
Subject: [PATCH] fix [#26577] Traceback error on 3ds import
---
io_scene_3ds/import_3ds.py | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/io_scene_3ds/import_3ds.py b/io_scene_3ds/import_3ds.py
index 0a86cdc10..34dc370d5 100644
--- a/io_scene_3ds/import_3ds.py
+++ b/io_scene_3ds/import_3ds.py
@@ -110,13 +110,13 @@ OBJECT_UV = 0x4140 # The UV texture coordinates
OBJECT_TRANS_MATRIX = 0x4160 # The Object Matrix
#>------ sub defines of EDITKEYFRAME
-# ED_KEY_AMBIENT_NODE = 0xB001
+ED_KEY_AMBIENT_NODE = 0xB001
ED_KEY_OBJECT_NODE = 0xB002
-# ED_KEY_CAMERA_NODE = 0xB003
-# ED_KEY_TARGET_NODE = 0xB004
-# ED_KEY_LIGHT_NODE = 0xB005
-# ED_KEY_L_TARGET_NODE = 0xB006
-# ED_KEY_SPOTLIGHT_NODE = 0xB007
+ED_KEY_CAMERA_NODE = 0xB003
+ED_KEY_TARGET_NODE = 0xB004
+ED_KEY_LIGHT_NODE = 0xB005
+ED_KEY_L_TARGET_NODE = 0xB006
+ED_KEY_SPOTLIGHT_NODE = 0xB007
#>------ sub defines of ED_KEY_OBJECT_NODE
# EK_OB_KEYFRAME_SEG = 0xB008
# EK_OB_KEYFRAME_CURTIME = 0xB009
@@ -633,7 +633,14 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH):
elif new_chunk.ID == EDITKEYFRAME:
pass
- elif new_chunk.ID == ED_KEY_OBJECT_NODE: #another object is being processed
+ # including these here means their EK_OB_NODE_HEADER are scanned
+ elif new_chunk.ID in {ED_KEY_AMBIENT_NODE,
+ ED_KEY_OBJECT_NODE,
+ ED_KEY_CAMERA_NODE,
+ ED_KEY_TARGET_NODE,
+ ED_KEY_LIGHT_NODE,
+ ED_KEY_L_TARGET_NODE,
+ ED_KEY_SPOTLIGHT_NODE}: # another object is being processed
child = None
elif new_chunk.ID == EK_OB_NODE_HEADER:
@@ -657,7 +664,8 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH):
elif new_chunk.ID == EK_OB_INSTANCE_NAME:
object_name, read_str_len = read_string(file)
- child.name = object_name
+ # child.name = object_name
+ child.name += "." + object_name
object_dictionary[object_name] = child
new_chunk.bytes_read += read_str_len
# print("new instance object:", object_name)
--
GitLab