Commit: 88a6aab8bbce423e042419fe26891bf8c5fbf84e
Author: Joshua Leung
Date: Fri Jul 6 15:01:28 2018 +1200
Branches: blender2.8
https://developer.blender.org/rB88a6aab8bbce423e042419fe26891bf8c5fbf84e
Fix T55775: Crash when select keyframe on object channels in Timeline editor
===================================================================
M source/blender/editors/space_action/action_select.c
===================================================================
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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
