forked from bartvdbraak/blender
Cleanup: rename clear_skin & clear_mask operators to skin_clear and mask_clear.
So that they match all other op names around - and sensible logic as well.
This commit is contained in:
parent
3a808270df
commit
944e0bd7b5
@ -369,8 +369,8 @@ class DATA_PT_customdata(MeshButtonsPanel, Panel):
|
||||
me = context.mesh
|
||||
col = layout.column()
|
||||
|
||||
col.operator("mesh.customdata_clear_mask", icon='X')
|
||||
col.operator("mesh.customdata_clear_skin", icon='X')
|
||||
col.operator("mesh.customdata_mask_clear", icon='X')
|
||||
col.operator("mesh.customdata_skin_clear", icon='X')
|
||||
|
||||
if me.has_custom_normals:
|
||||
col.operator("mesh.customdata_custom_splitnormals_clear", icon='X')
|
||||
|
@ -748,7 +748,7 @@ static int mesh_customdata_clear_exec__internal(bContext *C,
|
||||
}
|
||||
|
||||
/* Clear Mask */
|
||||
static int mesh_customdata_clear_mask_poll(bContext *C)
|
||||
static int mesh_customdata_mask_clear_poll(bContext *C)
|
||||
{
|
||||
Object *ob = ED_object_context(C);
|
||||
if (ob && ob->type == OB_MESH) {
|
||||
@ -772,7 +772,7 @@ static int mesh_customdata_clear_mask_poll(bContext *C)
|
||||
}
|
||||
return false;
|
||||
}
|
||||
static int mesh_customdata_clear_mask_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
static int mesh_customdata_mask_clear_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
{
|
||||
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);
|
||||
@ -787,17 +787,17 @@ static int mesh_customdata_clear_mask_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
}
|
||||
}
|
||||
|
||||
void MESH_OT_customdata_clear_mask(wmOperatorType *ot)
|
||||
void MESH_OT_customdata_mask_clear(wmOperatorType *ot)
|
||||
{
|
||||
|
||||
/* identifiers */
|
||||
ot->name = "Clear Sculpt-Mask Data";
|
||||
ot->idname = "MESH_OT_customdata_clear_mask";
|
||||
ot->idname = "MESH_OT_customdata_mask_clear";
|
||||
ot->description = "Clear vertex sculpt masking data from the mesh";
|
||||
|
||||
/* api callbacks */
|
||||
ot->exec = mesh_customdata_clear_mask_exec;
|
||||
ot->poll = mesh_customdata_clear_mask_poll;
|
||||
ot->exec = mesh_customdata_mask_clear_exec;
|
||||
ot->poll = mesh_customdata_mask_clear_poll;
|
||||
|
||||
/* flags */
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
@ -853,26 +853,26 @@ void MESH_OT_customdata_skin_add(wmOperatorType *ot)
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
}
|
||||
|
||||
static int mesh_customdata_clear_skin_poll(bContext *C)
|
||||
static int mesh_customdata_skin_clear_poll(bContext *C)
|
||||
{
|
||||
return mesh_customdata_skin_has(C);
|
||||
}
|
||||
|
||||
static int mesh_customdata_clear_skin_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
static int mesh_customdata_skin_clear_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
{
|
||||
return mesh_customdata_clear_exec__internal(C, BM_VERT, CD_MVERT_SKIN);
|
||||
}
|
||||
|
||||
void MESH_OT_customdata_clear_skin(wmOperatorType *ot)
|
||||
void MESH_OT_customdata_skin_clear(wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "Clear Skin Data";
|
||||
ot->idname = "MESH_OT_customdata_clear_skin";
|
||||
ot->idname = "MESH_OT_customdata_skin_clear";
|
||||
ot->description = "Clear vertex skin layer";
|
||||
|
||||
/* api callbacks */
|
||||
ot->exec = mesh_customdata_clear_skin_exec;
|
||||
ot->poll = mesh_customdata_clear_skin_poll;
|
||||
ot->exec = mesh_customdata_skin_clear_exec;
|
||||
ot->poll = mesh_customdata_skin_clear_poll;
|
||||
|
||||
/* flags */
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
|
@ -232,9 +232,9 @@ void MESH_OT_uv_texture_remove(struct wmOperatorType *ot);
|
||||
void MESH_OT_vertex_color_add(struct wmOperatorType *ot);
|
||||
void MESH_OT_vertex_color_remove(struct wmOperatorType *ot);
|
||||
/* no create_mask yet */
|
||||
void MESH_OT_customdata_clear_mask(struct wmOperatorType *ot);
|
||||
void MESH_OT_customdata_mask_clear(struct wmOperatorType *ot);
|
||||
void MESH_OT_customdata_skin_add(struct wmOperatorType *ot);
|
||||
void MESH_OT_customdata_clear_skin(struct wmOperatorType *ot);
|
||||
void MESH_OT_customdata_skin_clear(struct wmOperatorType *ot);
|
||||
void MESH_OT_customdata_custom_splitnormals_add(struct wmOperatorType *ot);
|
||||
void MESH_OT_customdata_custom_splitnormals_clear(struct wmOperatorType *ot);
|
||||
void MESH_OT_drop_named_image(struct wmOperatorType *ot);
|
||||
|
@ -151,9 +151,9 @@ void ED_operatortypes_mesh(void)
|
||||
WM_operatortype_append(MESH_OT_uv_texture_remove);
|
||||
WM_operatortype_append(MESH_OT_vertex_color_add);
|
||||
WM_operatortype_append(MESH_OT_vertex_color_remove);
|
||||
WM_operatortype_append(MESH_OT_customdata_clear_mask);
|
||||
WM_operatortype_append(MESH_OT_customdata_mask_clear);
|
||||
WM_operatortype_append(MESH_OT_customdata_skin_add);
|
||||
WM_operatortype_append(MESH_OT_customdata_clear_skin);
|
||||
WM_operatortype_append(MESH_OT_customdata_skin_clear);
|
||||
WM_operatortype_append(MESH_OT_customdata_custom_splitnormals_add);
|
||||
WM_operatortype_append(MESH_OT_customdata_custom_splitnormals_clear);
|
||||
WM_operatortype_append(MESH_OT_drop_named_image);
|
||||
|
Loading…
Reference in New Issue
Block a user