diff options
| author | Joshua Leung <aligorith@gmail.com> | 2018-07-06 06:01:28 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2018-07-06 06:01:28 +0300 |
| commit | 88a6aab8bbce423e042419fe26891bf8c5fbf84e (patch) | |
| tree | 2565d2a29888bc54cdabe956f18d17e9714a4cd8 /source/blender/editors/space_action | |
| parent | 08ae597d63d2e89888ae937c35357b2de62d7a8e (diff) | |
Fix T55775: Crash when select keyframe on object channels in Timeline editor
Diffstat (limited to 'source/blender/editors/space_action')
| -rw-r--r-- | source/blender/editors/space_action/action_select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index b6431596323..c46d0fdb035 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -1369,7 +1369,7 @@ static void mouse_action_keys(bAnimContext *ac, const int mval[2], short select_ rctf rectf; /* get dopesheet info */ - if (ac->datatype == ANIMCONT_DOPESHEET) + if (ELEM(ac->datatype, ANIMCONT_DOPESHEET, ANIMCONT_TIMELINE)) ads = ac->data; /* use View2D to determine the index of the channel (i.e a row in the list) where keyframe was */ @@ -1490,7 +1490,7 @@ static void mouse_action_keys(bAnimContext *ac, const int mval[2], short select_ deselect_action_keys(ac, 0, SELECT_SUBTRACT); /* highlight channel clicked on */ - if (ELEM(ac->datatype, ANIMCONT_ACTION, ANIMCONT_DOPESHEET)) { + if (ELEM(ac->datatype, ANIMCONT_ACTION, ANIMCONT_DOPESHEET, ANIMCONT_TIMELINE)) { /* deselect all other channels first */ ANIM_deselect_anim_channels(ac, ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR); |