diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-27 13:16:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-27 13:16:43 +0300 |
| commit | 5a1a63a858604f2a253b05c25feeb8da69b3f5b9 (patch) | |
| tree | 7e46f094b17dc9745db5973e4963fab62729b8c5 /source | |
| parent | aa592cc00cb4d434afec53dd5c3869d19bb48327 (diff) | |
| parent | 26f4ce4a769b142446def40f53ce22d8b30c617c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/collada/AnimationExporter.cpp | 1 | ||||
| -rw-r--r-- | source/blender/collada/collada_utils.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index 3e57dafed19..4687af5a771 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -156,7 +156,6 @@ void AnimationExporter::export_keyframed_animation_set(Object *ob) if (this->export_settings->export_transformation_type == BC_TRANSFORMATION_TYPE_MATRIX) { std::vector<float> ctimes; - std::vector<float[4][4]> values; find_keyframes(ob, ctimes); if (ctimes.size() > 0) export_sampled_matrix_animation(ob, ctimes); diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index cdc7b99722d..52767557397 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -107,7 +107,7 @@ extern int bc_set_layer(int bitfield, int layer, bool enable); extern int bc_set_layer(int bitfield, int layer); inline bool bc_in_range(float a, float b, float range) { - return abs(a - b) < range; + return fabsf(a - b) < range; } void bc_copy_m4_farray(float r[4][4], float *a); void bc_copy_farray_m4(float *r, float a[4][4]); |