[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50842] trunk/blender/source/blender/ editors/mesh/mesh_data.c: deleting mask data wasn't deleting loop data.
Campbell Barton
ideasman42 at gmail.com
Mon Sep 24 12:57:45 CEST 2012
Revision: 50842
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50842
Author: campbellbarton
Date: 2012-09-24 10:57:44 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
deleting mask data wasn't deleting loop data. also return OPERATOR_CANCELLED when nothing was done.
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/mesh_data.c
Modified: trunk/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_data.c 2012-09-24 01:50:26 UTC (rev 50841)
+++ trunk/blender/source/blender/editors/mesh/mesh_data.c 2012-09-24 10:57:44 UTC (rev 50842)
@@ -760,12 +760,17 @@
BLI_assert(CustomData_layertype_is_singleton(type) == TRUE);
- CustomData_free_layers(data, type, tot);
+ if (CustomData_has_layer(data, type)) {
+ CustomData_free_layers(data, type, tot);
- DAG_id_tag_update(&me->id, 0);
- WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
+ DAG_id_tag_update(&me->id, 0);
+ WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
- return OPERATOR_FINISHED;
+ return OPERATOR_FINISHED;
+ }
+ else {
+ return OPERATOR_CANCELLED;
+ }
}
/* Clear Mask */
@@ -785,13 +790,27 @@
if (CustomData_has_layer(data, CD_PAINT_MASK)) {
return TRUE;
}
+ data = GET_CD_DATA(me, ldata);
+ if (CustomData_has_layer(data, CD_GRID_PAINT_MASK)) {
+ return TRUE;
+ }
}
}
return FALSE;
}
static int mesh_customdata_clear_mask_exec(bContext *C, wmOperator *UNUSED(op))
{
- return mesh_customdata_clear_exec__internal(C, BM_VERT, CD_PAINT_MASK);
+ int ret_a = mesh_customdata_clear_exec__internal(C, BM_VERT, CD_PAINT_MASK);
+ int ret_b = mesh_customdata_clear_exec__internal(C, BM_LOOP, CD_GRID_PAINT_MASK);
+
+ if (ret_a == OPERATOR_FINISHED ||
+ ret_b == OPERATOR_FINISHED)
+ {
+ return OPERATOR_FINISHED;
+ }
+ else {
+ return OPERATOR_CANCELLED;
+ }
}
void MESH_OT_customdata_clear_mask(wmOperatorType *ot)
More information about the Bf-blender-cvs
mailing list