diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-15 19:36:02 +0400 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-02-15 19:36:02 +0400 |
commit | 9fe4dbb9f10e611d2c24eccbfbcbb9260370b8bd (patch) | |
tree | b551c97cc153d3dc76e9d307255b1cc6d0040211 /source/blender/collada/collada_utils.cpp | |
parent | 313dfbe35daaba41d6410042b12d1a1b63cb31a1 (diff) |
Fix: Collada Import files with X_UP and Y_UP axis where imported with wrong orientation
Diffstat (limited to 'source/blender/collada/collada_utils.cpp')
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 3e2d1795528..45db8510cbb 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -351,6 +351,10 @@ void bc_match_scale(std::vector<Object *> *objects_done, rescale[0] = rescale[1] = rescale[2] = scale_conv; float size_mat4[4][4]; + + float axis_mat4[4][4]; + unit_m4(axis_mat4); + size_to_mat4(size_mat4, rescale); for (std::vector<Object *>::iterator it = objects_done->begin(); @@ -359,6 +363,7 @@ void bc_match_scale(std::vector<Object *> *objects_done, { ob = *it; mult_m4_m4m4(ob->obmat, size_mat4, ob->obmat); + mult_m4_m4m4(ob->obmat, bc_unit.get_rotation(), ob->obmat); BKE_object_apply_mat4(ob, ob->obmat, 0, 0); } |