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

Fix crash clearing skin data on non mesh

Browse Source
This commit is contained in:
Campbell Barton
2015-05-25 00:02:35 +10:00
parent 0305e9604b
commit f9b6f5756c
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -803,8 +803,11 @@ void MESH_OT_customdata_mask_clear(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
/* Clear Skin */
static bool mesh_customdata_skin_has(bContext *C)
/**
* Clear Skin
* \return -1 invalid state, 0 no skin, 1 has skin.
*/
static int mesh_customdata_skin_state(bContext *C)
{
Object *ob = ED_object_context(C);
@@ -812,17 +815,15 @@ static bool mesh_customdata_skin_has(bContext *C)
Mesh *me = ob->data;
if (me->id.lib == NULL) {
CustomData *data = GET_CD_DATA(me, vdata);
if (CustomData_has_layer(data, CD_MVERT_SKIN)) {
return true;
}
return CustomData_has_layer(data, CD_MVERT_SKIN);
}
}
return false;
return -1;
}
static int mesh_customdata_skin_add_poll(bContext *C)
{
return !mesh_customdata_skin_has(C);
return (mesh_customdata_skin_state(C) == 0);
}
static int mesh_customdata_skin_add_exec(bContext *C, wmOperator *UNUSED(op))
@@ -855,7 +856,7 @@ void MESH_OT_customdata_skin_add(wmOperatorType *ot)
static int mesh_customdata_skin_clear_poll(bContext *C)
{
return mesh_customdata_skin_has(C);
return (mesh_customdata_skin_state(C) == 1);
}
static int mesh_customdata_skin_clear_exec(bContext *C, wmOperator *UNUSED(op))