diff options
| author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
|---|---|---|
| committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
| commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
| tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /source/blender/editors/gpencil/editaction_gpencil.c | |
| parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
| parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) | |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'source/blender/editors/gpencil/editaction_gpencil.c')
| -rw-r--r-- | source/blender/editors/gpencil/editaction_gpencil.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index aee97f40c31..a03a80bfbbc 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -209,21 +209,24 @@ void ED_gplayer_frames_select_border(bGPDlayer *gpl, float min, float max, short /* Frame Editing Tools */ /* Delete selected frames */ -void ED_gplayer_frames_delete(bGPDlayer *gpl) +bool ED_gplayer_frames_delete(bGPDlayer *gpl) { bGPDframe *gpf, *gpfn; + bool changed = false; /* error checking */ if (gpl == NULL) - return; + return false; /* check for frames to delete */ for (gpf = gpl->frames.first; gpf; gpf = gpfn) { gpfn = gpf->next; if (gpf->flag & GP_FRAME_SELECT) - gpencil_layer_delframe(gpl, gpf); + changed |= gpencil_layer_delframe(gpl, gpf); } + + return changed; } /* Duplicate selected frames from given gp-layer */ |