diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:22:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:22:43 +0300 |
| commit | 49ee1a97d2704d8cc707201675a919b9ef103fec (patch) | |
| tree | 17c78db252f4b24297490de623fe5f303cea181a /source/blender/collada/AnimationImporter.cpp | |
| parent | 292a2802ad376f4a3a2cc7bed763d0f5856dd98c (diff) | |
| parent | eb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/AnimationImporter.cpp')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 8f162f589df..4ab6498af87 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -1753,7 +1753,8 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float if (type != COLLADAFW::Transformation::ROTATE && type != COLLADAFW::Transformation::SCALE && type != COLLADAFW::Transformation::TRANSLATE && - type != COLLADAFW::Transformation::MATRIX) { + type != COLLADAFW::Transformation::MATRIX) + { fprintf(stderr, "animation of transformation %d is not supported yet\n", type); return false; } |