diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-07-30 16:18:24 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-07-30 16:18:24 +0400 |
| commit | f7169cd47d26af86e0be8980d557c274829732ec (patch) | |
| tree | b3dc6c8c326d1d0e410bec283c165246b2f67537 /source/blender/collada | |
| parent | 5c69338fe61d24924dfb3d9a5c9f960b62cc6e7e (diff) | |
fix: [#36148] Collada instance nodes are not scaled properly during import
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 51b6dd0357e..c6337e27218 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -565,12 +565,10 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node, COLLA Object *source_ob = (Object *)it2->second; COLLADAFW::Node *source_node = node_map[node_id]; ob = create_instance_node(source_ob, source_node, node, sce, is_library_node); - } - } - if (ob != NULL) { - objects_done->push_back(ob); - if (parent_node == NULL) { - root_objects->push_back(ob); + objects_done->push_back(ob); + if (parent_node == NULL) { + root_objects->push_back(ob); + } } } ++inst_done; |