merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though...
[blender-staging.git] / source / blender / ikplugin / intern / itasc_plugin.cpp
index af69cb9a996c4e80b45ba587be7069c331f01bf6..1be567371c63ddf05eb726c5b83f94d9674bc51a 100644 (file)
@@ -1121,14 +1121,12 @@ static IK_Scene* convert_tree(Scene *blscene, Object *ob, bPoseChannel *pchan)
 
                KDL::Frame tip(iTaSC::F_identity);
                Vector3 *fl = bone->bone_mat;
-               KDL::Rotation brot(
-                                                  fl[0][0], fl[1][0], fl[2][0],
-                                                  fl[0][1], fl[1][1], fl[2][1],
-                                                  fl[0][2], fl[1][2], fl[2][2]);
-               KDL::Vector bpos(bone->head[0], bone->head[1], bone->head[2]);
-               bpos = bpos*scale;
-               KDL::Frame head(brot, bpos);
-               
+               KDL::Frame head(KDL::Rotation(
+                       fl[0][0], fl[1][0], fl[2][0],
+                       fl[0][1], fl[1][1], fl[2][1],
+                       fl[0][2], fl[1][2], fl[2][2]),
+                       KDL::Vector(bone->head[0], bone->head[1], bone->head[2])*scale);
+
                // rest pose length of the bone taking scaling into account
                length= bone->length*scale;
                parent = (a > 0) ? ikscene->channels[tree->parent[a]].tail : root;