griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

deleting mask data wasn't deleting loop data. also return OPERATOR_CANCELLED when nothing was done.

Browse Source
This commit is contained in:
Campbell Barton
2012-09-24 10:57:44 +00:00
parent 953e2321dd
commit 5a5b37a4fa
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/editors/mesh/mesh_data.c
View File

@@ -760,12 +760,17 @@ static int mesh_customdata_clear_exec__internal(bContext *C,
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 @@ static int mesh_customdata_clear_mask_poll(bContext *C)
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)