diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-20 16:05:22 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-20 16:05:22 +0300 |
| commit | 792eab8190f538d15ea2086a641383e2c3b3d03e (patch) | |
| tree | c0b480a27a61ae2a4c4fefc8351a433526364a88 /source/blender/collada | |
| parent | 50579da91a380bac1ca0fa67df62520ee7b47aa5 (diff) | |
| parent | ff839fb6c1c4b45786f9bbcb302d0af4d03c004a (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 4ab6498af87..f37b0ee1319 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -81,7 +81,7 @@ void AnimationImporter::add_bezt(FCurve *fcu, float frame, float value, eBezTrip bez.ipo = ipo; /* use default interpolation mode here... */ bez.f1 = bez.f2 = bez.f3 = SELECT; bez.h1 = bez.h2 = HD_AUTO; - insert_bezt_fcurve(fcu, &bez, 0); + insert_bezt_fcurve(fcu, &bez, INSERTKEY_NOFLAGS); calchandles_fcurve(fcu); } @@ -148,7 +148,7 @@ void AnimationImporter::animation_to_fcurves(COLLADAFW::AnimationCurve *curve) // bez.ipo = U.ipo_new; /* use default interpolation mode here... */ bez.f1 = bez.f2 = bez.f3 = SELECT; - insert_bezt_fcurve(fcu, &bez, 0); + insert_bezt_fcurve(fcu, &bez, INSERTKEY_NOFLAGS); } calchandles_fcurve(fcu); |