diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-24 13:51:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-24 13:51:59 +0300 |
| commit | 2b6a7563ac4db60d02c9530c4d1870ea8c3a6a0e (patch) | |
| tree | 1df97348527a7624d79ce8345648d18ea4f6f299 | |
| parent | b196c481d2eda932832daf4f65a68c80a8bdad5e (diff) | |
Fix T48713: Problem when importing FBX file with 2 armatures.
Yet another case of the infamous 'iterating over something while modifying it' issue.
Here, setting parent of a node actually modifies the children list of its previous parent,
which resulted in missed items in the iteration.
| -rw-r--r-- | io_scene_fbx/__init__.py | 2 | ||||
| -rw-r--r-- | io_scene_fbx/import_fbx.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index decd9474..687e0904 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -21,7 +21,7 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier", - "version": (3, 7, 4), + "version": (3, 7, 5), "blender": (2, 77, 0), "location": "File > Import-Export", "description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions", diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py index ca3a06e1..4055a3b0 100644 --- a/io_scene_fbx/import_fbx.py +++ b/io_scene_fbx/import_fbx.py @@ -1677,11 +1677,12 @@ class FbxImportHelperNode: armature = self else: # otherwise insert a new node + # XXX Maybe in case self is virtual FBX root node, we should instead add one armature per bone child? armature = FbxImportHelperNode(None, None, None, False) armature.fbx_name = "Armature" armature.is_armature = True - for child in self.children: + for child in tuple(self.children): if child.is_bone: child.parent = armature |