diff options
| author | Joshua Leung <aligorith@gmail.com> | 2016-02-05 16:34:57 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2016-02-05 16:40:43 +0300 |
| commit | c4dc14b079d81fd012383b910291246e7ebf9a04 (patch) | |
| tree | 576546590ab4703dad59fea84bd8355683861c48 /source/blender/editors/space_action | |
| parent | c105c59bb4e00d88c688f63c699dc78c0be4592a (diff) | |
Fix T45915: Cannot select keyframes in summary channels in Dope Sheet in TweakMode
When in TweakMode on NLA strips that had an offset, it was not possible to select
those keyframes in the Summary Channel in the Dope Sheet.
The main gist of it is that the current code is from before the summary track was
introduced, and so could assume that ANIM_nla_mapping_get() would work for all channels
present. Thus, simply converting the clicked frame to nla-mapped time once would be
enough. However, for summary channels, nla-mapping_get() doesn't do anything, since
we can potentially include keyframes from several different objects!
Diffstat (limited to 'source/blender/editors/space_action')
| -rw-r--r-- | source/blender/editors/space_action/action_select.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 3c9c88a0ae6..574d3f6f2c9 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -948,6 +948,7 @@ static void actkeys_mselect_single(bAnimContext *ac, bAnimListElem *ale, short s select_cb = ANIM_editkeyframes_select(select_mode); ok_cb = ANIM_editkeyframes_ok(BEZT_OK_FRAME); ked.f1 = selx; + ked.iterflags |= KED_F1_NLA_UNMAP; /* select the nominated keyframe on the given frame */ if (ale->type == ANIMTYPE_GPLAYER) { |