diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
| commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
| tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/editors/animation | |
| parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
| parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/keyframes_draw.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyframes_edit.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 859eb05e7b9..fcccf07190b 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -1057,4 +1057,3 @@ void mask_to_keylist(bDopeSheet *UNUSED(ads), MaskLayer *masklay, DLRBT_Tree *ke } } } - diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index 6b24008c4d8..1bbfa6cc979 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -1471,4 +1471,3 @@ short bezt_selmap_flush(KeyframeEditData *ked, BezTriple *bezt) return 0; } - |