diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:53 +0300 |
commit | 059c119719e04283808d3c7076886e1a58874f6b (patch) | |
tree | 5296776b81111ef62e33687d4a9b4c6ab5e297ff /source/blender/collada/BCAnimationCurve.cpp | |
parent | fa0fcbe4d6ca3f183f02395fe9ba18fb5ea87748 (diff) | |
parent | e742e0934de6384eeaf271ca4cfe99922ddbe3fb (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/BCAnimationCurve.cpp')
-rw-r--r-- | source/blender/collada/BCAnimationCurve.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/collada/BCAnimationCurve.cpp b/source/blender/collada/BCAnimationCurve.cpp index 903a6eab3bb..87cf07cc21c 100644 --- a/source/blender/collada/BCAnimationCurve.cpp +++ b/source/blender/collada/BCAnimationCurve.cpp @@ -386,8 +386,8 @@ void BCAnimationCurve::add_value(const float val, const int frame_index) FCurve *fcu = get_edit_fcurve(); fcu->auto_smoothing = FCURVE_SMOOTH_CONT_ACCEL; insert_vert_fcurve( - fcu, - frame_index, val, + fcu, + frame_index, val, BEZT_KEYTYPE_KEYFRAME, INSERTKEY_NOFLAGS); @@ -676,4 +676,3 @@ void BCBezTriple::get_tangent(Scene *scene, float point[2], bool as_angle, int i point[1] = bezt.vec[index][1]; } } - |