diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-05 15:56:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-05 15:56:03 +0300 |
| commit | 572b1a644f29eff9b37b45543bfc27a2d68022c7 (patch) | |
| tree | 86d1a83307378ee0e1506021f8c0729d82f3cc06 /source/blender/editors/space_action | |
| parent | 7dfcbe01b0a2a1ca625c80eb385bf4753b3fb3ef (diff) | |
| parent | 4d85396fe4f7e3a870fb844b5207179f7dd03eb2 (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index 553be0ad290..17edbc6cc1d 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -262,6 +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 */ case ANIMTYPE_GPDATABLOCK: { bGPdata *gpd = ale->data; @@ -271,6 +272,7 @@ static void borderselect_action(bAnimContext *ac, const rcti rect, short mode, s } break; } +#endif case ANIMTYPE_GPLAYER: ED_gplayer_frames_select_border(ale->data, rectf.xmin, rectf.xmax, selectmode); break; |