[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58743] trunk/blender/source/blender/ collada/DocumentImporter.cpp: fix: [#36148] Collada instance nodes are not scaled properly during import

[Gaia Clary]

Revision: 58743
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58743
Author:   gaiaclary
Date:     2013-07-30 12:18:24 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
fix: [#36148] Collada instance nodes are not scaled properly during import

Modified Paths:
--------------
    trunk/blender/source/blender/collada/DocumentImporter.cpp

Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp	2013-07-30 11:10:04 UTC (rev 58742)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp	2013-07-30 12:18:24 UTC (rev 58743)
@@ -565,14 +565,12 @@
 					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);
+					objects_done->push_back(ob);
+					if (parent_node == NULL) {
+						root_objects->push_back(ob);
+					}
 				}
 			}
-			if (ob != NULL) {
-				objects_done->push_back(ob);
-				if (parent_node == NULL) {
-					root_objects->push_back(ob);
-				}
-			}
 			++inst_done;
 
 			read_transform = false;