[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48035] branches/soc-2012-bratwurst/source /blender/assimp/SceneImporter.cpp: # bf_assimp: picked the wrong anchor node.

[Alexander Gessler]

Revision: 48035
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48035
Author:   aramis_acg
Date:     2012-06-18 13:04:03 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
# bf_assimp: picked the wrong anchor node.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/assimp/SceneImporter.cpp

Modified: branches/soc-2012-bratwurst/source/blender/assimp/SceneImporter.cpp
===================================================================
--- branches/soc-2012-bratwurst/source/blender/assimp/SceneImporter.cpp 
2012-06-18 13:01:24 UTC (rev 48034)
+++ branches/soc-2012-bratwurst/source/blender/assimp/SceneImporter.cpp 
2012-06-18 13:04:03 UTC (rev 48035)
@@ -393,6 +393,8 @@
                for (unsigned int i = 0; i < cameras; ++i, ++it) {
                        rename_id(&(*it)->id,(name+"-camera").c_str());
                }
+
+               assert(it+1 == objects_done.end());
        }
 
 
@@ -400,7 +402,7 @@
                return;
        }
 
-       Object& anchor = *objects_done.front();
+       Object& anchor = *objects_done.back();
        convert_node_transform(in_node, anchor); 
 
        objects_by_node[&in_node] = &anchor;
@@ -410,7 +412,7 @@
                util_set_parent(&anchor, out_parent ,C, true);
        }
 
-       for (ObjectVector::iterator it = objects_done.begin() + 1, end = 
objects_done.end(); it != end; ++it) {
+       for (ObjectVector::iterator it = objects_done.begin(), end = 
objects_done.end() - 1; it != end; ++it) {
                Object& obj = **it;
 
                set_identity_transform(obj);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs