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

delete menu is back DKEY. seperating may be needed to delete_mesh

Browse Source
This commit is contained in:
Shaul Kedem
2009-01-31 02:31:58 +00:00
parent 1e1c193092
commit 05e04c5e45
3 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
source/blender/editors/mesh/editmesh_tools.c
View File

@@ -965,16 +965,15 @@ static void erase_vertices(EditMesh *em, ListBase *l)
}
}
void delete_mesh(Object *obedit, EditMesh *em)
void delete_mesh(Object *obedit, EditMesh *em, int event)
{
EditFace *efa, *nextvl;
EditVert *eve,*nextve;
EditEdge *eed,*nexted;
short event;
int count;
char *str="Erase";
event= pupmenu("Erase %t|Vertices%x10|Edges%x1|Faces%x2|All%x3|Edges & Faces%x4|Only Faces%x5|Edge Loop%x6");
if(event<1) return;
if(event==10 ) {
@@ -1106,6 +1105,60 @@ void delete_mesh(Object *obedit, EditMesh *em)
BIF_undo_push(str);
}
static int delete_mesh_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
delete_mesh(obedit,em,RNA_int_get(op->ptr, "event"));
ED_undo_push(C, "Delete Mesh"); // Note this will become depricated
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
return OPERATOR_FINISHED;
}
static int delete_mesh_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
int items;
char *menu, *p;
items = 6;
menu= MEM_callocN(items * OP_MAX_TYPENAME, "string");
p= menu + sprintf(menu, "%s %%t", "Erase");
p+= sprintf(p, "|%s %%x%d", "Vertices", 10);
p+= sprintf(p, "|%s %%x%d", "Edges", 1);
p+= sprintf(p, "|%s %%x%d", "Faces", 2);
p+= sprintf(p, "|%s %%x%d", "All", 3);
p+= sprintf(p, "|%s %%x%d", "Edges & Faces", 4);
p+= sprintf(p, "|%s %%x%d", "Only Faces", 5);
p+= sprintf(p, "|%s %%x%d", "Edge Loop", 6);
uiPupMenuOperator(C, 20, op, "event", menu);
MEM_freeN(menu);
return OPERATOR_RUNNING_MODAL;
}
void MESH_OT_delete_mesh(wmOperatorType *ot)
{
/* identifiers */
ot->name= "delete mesh";
ot->idname= "MESH_OT_delete_mesh";
/* api callbacks */
ot->invoke= delete_mesh_invoke;
ot->exec= delete_mesh_exec;
ot->poll= ED_operator_editmesh;
/*props */
RNA_def_int(ot->srna, "event", 0, 0, INT_MAX, "event", "", 0, 1000);
}
/* Got this from scanfill.c. You will need to juggle around the
* callbacks for the scanfill.c code a bit for this to work. */

2
source/blender/editors/mesh/mesh_intern.h
View File

@@ -232,5 +232,7 @@ void MESH_OT_edge_flip(struct wmOperatorType *ot);
void MESH_OT_mesh_set_smooth_faces(struct wmOperatorType *ot);
void MESH_OT_mesh_set_solid_faces(struct wmOperatorType *ot);
void MESH_OT_delete_mesh(struct wmOperatorType *ot);
#endif // MESH_INTERN_H

11
source/blender/editors/mesh/mesh_ops.c
View File

@@ -137,6 +137,9 @@ void ED_operatortypes_mesh(void)
WM_operatortype_append(MESH_OT_removedoublesflag);
WM_operatortype_append(MESH_OT_extrude_mesh);
WM_operatortype_append(MESH_OT_edit_faces);
WM_operatortype_append(MESH_OT_delete_mesh);
WM_operatortype_append(MESH_OT_separate);
WM_operatortype_append(MESH_OT_dupli_extrude_cursor);
WM_operatortype_append(MESH_OT_loop_select);
@@ -186,6 +189,14 @@ void ED_keymap_mesh(wmWindowManager *wm)
WM_keymap_add_item(keymap, "MESH_OT_extrude_mesh", EKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "MESH_OT_edit_faces", PKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_delete_mesh", DKEY, KM_PRESS, 0, 0);
/* add */
WM_keymap_add_item(keymap, "MESH_OT_add_edge_face", FKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "MESH_OT_add_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);