diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-15 18:32:45 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-15 18:32:45 +0300 |
| commit | adf1b932f0092d3a814bcd7aa6827c53e3b520f7 (patch) | |
| tree | c13b9678a076f91a3fdcd55659d9e3c1dc29c1a3 /source/blender/editors/animation | |
| parent | e1c1b546b5817ff8d8711edc41c12a5d10dd094c (diff) | |
| parent | ce0d3112e40fe54bd56926b758cda4e502fb782a (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/editors/animation/anim_draw.c
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index fd7551abab3..d08a32c6e6b 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -3055,7 +3055,7 @@ static bool select_anim_channel_keys(bAnimContext *ac, int channel_index, bool e ANIM_animdata_freelist(&anim_data); /* F-Curve may not have any keyframes */ - if (fcu->bezt) { + if (fcu && fcu->bezt) { BezTriple *bezt; if (!extend) { diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index 7d669e8c93e..d5945425576 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -389,7 +389,8 @@ float ANIM_unit_mapping_get_factor(Scene *scene, ID *id, FCurve *fcu, short flag return 1.0f; } -static bool find_prev_next_keyframes(struct bContext *C, int *nextfra, int *prevfra) { +static bool find_prev_next_keyframes(struct bContext *C, int *nextfra, int *prevfra) +{ Scene *scene = CTX_data_scene(C); Object *ob = CTX_data_active_object(C); bGPdata *gpd = CTX_data_gpencil_data(C); |