diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:10:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:10:35 +0300 |
| commit | 908b6960c01ffb1665af56ff6f03aaa3eac5366a (patch) | |
| tree | db609864fbe601073212b4c37541a7965ea96ea5 /source/blender/collada/TransformReader.cpp | |
| parent | d352a0adc5dadd0bfdc3b1b1ac76d92be689966b (diff) | |
| parent | a25c11fd8d602236f36c34c342453149bdc1d909 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/TransformReader.cpp')
| -rw-r--r-- | source/blender/collada/TransformReader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/collada/TransformReader.cpp index 7f742be7e30..bf9c34153b7 100644 --- a/source/blender/collada/TransformReader.cpp +++ b/source/blender/collada/TransformReader.cpp @@ -54,7 +54,7 @@ void TransformReader::get_node_mat( float copy[4][4]; unit_m4(mat); - + for (unsigned int i = 0; i < node->getTransformations().getCount(); i++) { COLLADAFW::Transformation *tm = node->getTransformations()[i]; @@ -87,11 +87,11 @@ void TransformReader::get_node_mat( copy_m4_m4(copy, mat); mul_m4_m4m4(mat, copy, cur); - + if (animation_map) { // AnimationList that drives this Transformation const COLLADAFW::UniqueId& anim_list_id = tm->getAnimationList(); - + // store this so later we can link animation data with ob Animation anim = {ob, node, tm}; (*animation_map)[anim_list_id] = anim; |