diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-17 13:07:03 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-17 13:07:03 +0300 |
| commit | 004429761d182cc726035d89e442ae7067a8f144 (patch) | |
| tree | de2338c4ba73394ed1efc3b31528deccce18d420 /source/blender/editors/animation | |
| parent | 459b1a907ce542ec3f10a533d27832ac9dfbc92d (diff) | |
| parent | bf8ea6b60e69e6dd77d94c66cbcbab2a8e0b73f8 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_view3d.h
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/keyframes_general.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 932a00d1687..2d869d272bd 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -774,7 +774,7 @@ static void paste_animedit_keys_fcurve(FCurve *fcu, tAnimCopybufItem *aci, float /* First de-select existing FCurve's keyframes */ for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) { - bezt->f2 &= ~SELECT; + BEZ_DESEL(bezt); } /* mix mode with existing data */ |