diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-20 02:10:11 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-20 02:10:11 +0400 |
commit | 103ef7cacb5dd10aa2dfd5bb973c0dfd772885eb (patch) | |
tree | 8fd9a6b770998717f4555e7121fb16116b441865 /source/blender/collada/TransformWriter.cpp | |
parent | eb21bdd249427465a093a078cda7864309a8f735 (diff) | |
parent | 869d654cccba8b9b0bc295e7ce89e8e322912023 (diff) |
Merged changes from trunk r58324-58419.ge_dev
Diffstat (limited to 'source/blender/collada/TransformWriter.cpp')
-rw-r--r-- | source/blender/collada/TransformWriter.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index b088139262c..c3665a33ca4 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -107,15 +107,18 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, B converter.mat4_to_dae_double(d_obmat, f_obmat); switch (transformation_type) { - case BC_TRANSFORMATION_TYPE_MATRIX : { + case BC_TRANSFORMATION_TYPE_MATRIX: + { node.addMatrix("transform",d_obmat); break; } - case BC_TRANSFORMATION_TYPE_BOTH : { + case BC_TRANSFORMATION_TYPE_BOTH: + { node.addMatrix("transform",d_obmat); - /* intentional fall-through */ + /* fall-through */ } - case BC_TRANSFORMATION_TYPE_TRANSROTLOC: { + case BC_TRANSFORMATION_TYPE_TRANSROTLOC: + { float loc[3], rot[3], scale[3]; TransformBase::decompose(f_obmat, loc, rot, NULL, scale); add_transform(node, loc, rot, scale); |