diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-12-13 11:03:13 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-12-13 11:03:13 +0300 |
| commit | a1f87064c4c0cd9e8eafc19c599c4ad4ccdba49f (patch) | |
| tree | d016e95050f10eda7bc44e1bdfa2f7c4fc0fc024 /source/blender/editors/gpencil/gpencil_select.c | |
| parent | d9ee88d126ddb59b68d2561694b522a99e4923b6 (diff) | |
Grease Pencil: Merge GPencil_Editing_Stage3 branch into master
This commit merges all the work done in the GPencil_Editing_Stage3 branch
as of ef2aecf2db981b5344e0d14e7f074f1742b0b2f7 into master. For more details
about the changes that this brings, see the WIP release notes:
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.77/GPencil
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_select.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_select.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c index 0dd91019a8c..83a1f2458eb 100644 --- a/source/blender/editors/gpencil/gpencil_select.c +++ b/source/blender/editors/gpencil/gpencil_select.c @@ -67,10 +67,15 @@ static int gpencil_select_poll(bContext *C) { bGPdata *gpd = ED_gpencil_data_get_active(C); - bGPDlayer *gpl = gpencil_layer_getactive(gpd); - /* only if there's an active layer with an active frame */ - return (gpl && gpl->actframe); + /* we just need some visible strokes, and to be in editmode */ + if ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE)) { + /* TODO: include a check for visible strokes? */ + if (gpd->layers.first) + return true; + } + + return false; } /* ********************************************** */ |