diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-22 02:59:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-22 02:59:32 +0300 |
| commit | 257cf86a05517fd66d65f55c95fc28ec945804a8 (patch) | |
| tree | c5285a39e47d56ef926a91be803685521ef6f2be /source/blender/editors/space_action | |
| parent | 04964ff1f4ef9ad23fa3e6cb0444bf28dd6813b5 (diff) | |
| parent | 5d5c6bb5efee9bd03004845f9b1eee9d43883525 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_action')
| -rw-r--r-- | source/blender/editors/space_action/action_select.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 3c3a71d00fd..3346c628336 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -262,7 +262,7 @@ static void borderselect_action(bAnimContext *ac, const rcti rect, short mode, s { /* loop over data selecting */ switch (ale->type) { -#if 0 /* XXXX: Keyframes are not currently shown here */ +#if 0 /* XXX: Keyframes are not currently shown here */ case ANIMTYPE_GPDATABLOCK: { bGPdata *gpd = ale->data; @@ -466,6 +466,7 @@ static void region_select_action_keys(bAnimContext *ac, const rctf *rectf_view, { /* loop over data selecting */ switch (ale->type) { +#if 0 /* XXX: Keyframes are not currently shown here */ case ANIMTYPE_GPDATABLOCK: { bGPdata *gpd = ale->data; @@ -475,6 +476,7 @@ static void region_select_action_keys(bAnimContext *ac, const rctf *rectf_view, } break; } +#endif case ANIMTYPE_GPLAYER: { ED_gplayer_frames_select_region(&ked, ale->data, mode, selectmode); @@ -718,8 +720,6 @@ static void columnselect_action_keys(bAnimContext *ac, short mode) KeyframeEditFunc select_cb, ok_cb; KeyframeEditData ked = {{NULL}}; - /* initialize keyframe editing data */ - /* build list of columns */ switch (mode) { case ACTKEYS_COLUMNSEL_KEYS: /* list of selected keys */ |