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/mask/mask_editaction.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/mask/mask_editaction.c')
| -rw-r--r-- | source/blender/editors/mask/mask_editaction.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/editors/mask/mask_editaction.c b/source/blender/editors/mask/mask_editaction.c index 707622fa841..20d49e89771 100644 --- a/source/blender/editors/mask/mask_editaction.c +++ b/source/blender/editors/mask/mask_editaction.c @@ -207,21 +207,26 @@ void ED_masklayer_frames_select_border(MaskLayer *masklay, float min, float max, /* Frame Editing Tools */ /* Delete selected frames */ -void ED_masklayer_frames_delete(MaskLayer *masklay) +bool ED_masklayer_frames_delete(MaskLayer *masklay) { MaskLayerShape *masklay_shape, *masklay_shape_next; + bool changed = false; /* error checking */ if (masklay == NULL) - return; + return false; /* check for frames to delete */ for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape_next) { masklay_shape_next = masklay_shape->next; - if (masklay_shape->flag & MASK_SHAPE_SELECT) + if (masklay_shape->flag & MASK_SHAPE_SELECT) { BKE_mask_layer_shape_unlink(masklay, masklay_shape); + changed = true; + } } + + return changed; } /* Duplicate selected frames from given mask-layer */ |