diff options
author | Joseph Eagar <joeedh@gmail.com> | 2009-04-11 12:26:51 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2009-04-11 12:26:51 +0400 |
commit | 59578bfad2b5ab0cd8cb384840ebf17761651851 (patch) | |
tree | 0c21d570c761a6f3d3f81c1efc869498bd7945a1 /source/blender/editors/mesh/editmesh_mods.c | |
parent | fc02e980f43074a383b249c7d8118a7132afec47 (diff) |
as per discussion with ton, the editmesh accessors now live
in blenkernel.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_mods.c')
-rw-r--r-- | source/blender/editors/mesh/editmesh_mods.c | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 0f8a15fd200..c21e579b030 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -801,7 +801,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) Scene *scene= CTX_data_scene(C); Object *obedit= CTX_data_edit_object(C); Mesh *me= obedit->data; - EditMesh *em= EM_GetEditMesh(me); + EditMesh *em= BKE_mesh_get_editmesh(me); int selcount = similar_face_select__internal(scene, em, RNA_int_get(op->ptr, "type")); @@ -809,11 +809,11 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) /* here was an edge-mode only select flush case, has to be generalized */ EM_selectmode_flush(em); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); return OPERATOR_FINISHED; } - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); return OPERATOR_CANCELLED; } @@ -1062,7 +1062,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) Scene *scene= CTX_data_scene(C); Object *obedit= CTX_data_edit_object(C); Mesh *me= obedit->data; - EditMesh *em= EM_GetEditMesh(me); + EditMesh *em= BKE_mesh_get_editmesh(me); int selcount = similar_edge_select__internal(scene, em, RNA_int_get(op->ptr, "type")); @@ -1070,11 +1070,11 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) /* here was an edge-mode only select flush case, has to be generalized */ EM_selectmode_flush(em); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); return OPERATOR_FINISHED; } - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); return OPERATOR_CANCELLED; } @@ -1117,7 +1117,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) Scene *scene= CTX_data_scene(C); Object *obedit= CTX_data_edit_object(C); Mesh *me= obedit->data; - EditMesh *em= EM_GetEditMesh(me); + EditMesh *em= BKE_mesh_get_editmesh(me); EditVert *eve, *base_eve=NULL; unsigned int selcount=0; /* count how many new edges we select*/ @@ -1144,7 +1144,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) } if (!ok || !deselcount) { /* no data selected OR no more data to select*/ - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); return 0; } @@ -1175,7 +1175,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) selcount++; deselcount--; if (!deselcount) {/*have we selected all posible faces?, if so return*/ - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); return selcount; } } @@ -1193,7 +1193,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) selcount++; deselcount--; if (!deselcount) {/*have we selected all posible faces?, if so return*/ - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); return selcount; } } @@ -1207,7 +1207,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) CD_MDEFORMVERT); if (!base_dvert || base_dvert->totweight == 0) { - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); return selcount; } @@ -1225,7 +1225,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) selcount++; deselcount--; if (!deselcount) { /*have we selected all posible faces?, if so return*/ - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); return selcount; } break; @@ -1240,11 +1240,11 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) if(selcount) { WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); return OPERATOR_FINISHED; } - EM_EndEditMesh(me, em); + BKE_mesh_end_editmesh(me, em); return OPERATOR_CANCELLED; } @@ -1932,7 +1932,7 @@ static void edgering_select(EditMesh *em, EditEdge *startedge, int select) static int loop_multiselect(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); EditEdge *eed; EditEdge **edarray; int edindex, edfirstcount; @@ -1971,7 +1971,7 @@ static int loop_multiselect(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -2509,7 +2509,7 @@ void selectconnected_mesh_all(EditMesh *em) static int select_linked_exec(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(obedit->data); + EditMesh *em= BKE_mesh_get_editmesh(obedit->data); if( RNA_boolean_get(op->ptr, "limit") ) { ViewContext vc; @@ -2521,7 +2521,7 @@ static int select_linked_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -2650,13 +2650,13 @@ void EM_hide_mesh(EditMesh *em, int swap) static int hide_mesh_exec(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); EM_hide_mesh(em, RNA_boolean_get(op->ptr, "unselected")); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -2716,13 +2716,13 @@ void EM_reveal_mesh(EditMesh *em) static int reveal_mesh_exec(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); EM_reveal_mesh(em); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -2776,7 +2776,7 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op) * small enough, select the edge */ Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); EditEdge *eed; EditFace *efa; EditFace **efa1; @@ -2788,7 +2788,7 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op) if(em->selectmode==SCE_SELECT_FACE) { BKE_report(op->reports, RPT_ERROR, "Doesn't work in face selection mode"); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_CANCELLED; } @@ -2868,7 +2868,7 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); //TODO is this needed ? - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -3029,13 +3029,13 @@ static void select_linked_flat_faces(EditMesh *em, wmOperator *op, float sharpne static int select_linked_flat_faces_exec(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); select_linked_flat_faces(em, op, RNA_float_get(op->ptr, "sharpness")); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -3129,13 +3129,13 @@ void select_non_manifold(EditMesh *em, wmOperator *op ) static int select_non_manifold_exec(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); select_non_manifold(em, op); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -3192,13 +3192,13 @@ void EM_select_swap(EditMesh *em) /* exported for UV */ static int select_invert_mesh_exec(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); EM_select_swap(em); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -3229,12 +3229,12 @@ void EM_toggle_select_all(EditMesh *em) /* exported for UV */ static int toggle_select_all_exec(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); EM_toggle_select_all(em); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -3297,7 +3297,7 @@ void EM_select_more(EditMesh *em) static int select_more(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)) ; + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)) ; EM_select_more(em); @@ -3305,7 +3305,7 @@ static int select_more(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -3387,14 +3387,14 @@ void EM_select_less(EditMesh *em) static int select_less(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); EM_select_less(em); // if (EM_texFaceCheck(em)) WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -3457,13 +3457,13 @@ static void selectrandom_mesh(EditMesh *em, float perc) /* randomly selects a us static int mesh_select_random_exec(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); selectrandom_mesh(em, RNA_float_get(op->ptr,"percent")); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -3547,13 +3547,13 @@ static int mesh_selection_type_exec(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); mesh_selection_type(CTX_data_scene(C), em, RNA_enum_get(op->ptr,"type")); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -3581,7 +3581,7 @@ void MESH_OT_selection_type(wmOperatorType *ot) static int editmesh_mark_seam(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); Mesh *me= ((Mesh *)obedit->data); EditEdge *eed; int clear = RNA_boolean_get(op->ptr, "clear"); @@ -3612,7 +3612,7 @@ static int editmesh_mark_seam(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -3635,7 +3635,7 @@ void MESH_OT_mark_seam(wmOperatorType *ot) static int editmesh_mark_sharp(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); Mesh *me= ((Mesh *)obedit->data); int set = RNA_boolean_get(op->ptr, "set"); EditEdge *eed; @@ -3661,7 +3661,7 @@ static int editmesh_mark_sharp(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -4056,7 +4056,7 @@ void righthandfaces(EditMesh *em, int select) /* makes faces righthand turning * static int righthandfaces_exec(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); /* 'standard' behaviour - check if selected, then apply relevant selection */ @@ -4065,7 +4065,7 @@ static int righthandfaces_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); //TODO is this needed ? - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -4276,7 +4276,7 @@ static int smooth_vertex(bContext *C, wmOperator *op) ModifierData *md= obedit->modifiers.first; if(em==NULL) { - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_CANCELLED; } @@ -4287,7 +4287,7 @@ static int smooth_vertex(bContext *C, wmOperator *op) eve= eve->next; } if(teller==0) { - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_CANCELLED; } @@ -4402,7 +4402,7 @@ static int smooth_vertex(bContext *C, wmOperator *op) // DAG_object_flush_update(scene, obedit, OB_RECALC_DATA); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -4527,13 +4527,13 @@ static int vertices_to_sphere_exec(bContext *C, wmOperator *op) Object *obedit= CTX_data_edit_object(C); View3D *v3d = CTX_wm_view3d(C); Scene *scene = CTX_data_scene(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); vertices_to_sphere(scene, v3d, obedit, em, RNA_float_get(op->ptr,"percent")); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } @@ -4577,7 +4577,7 @@ void flipface(EditMesh *em, EditFace *efa) static int flip_editnormals(bContext *C, wmOperator *op) { Object *obedit= CTX_data_edit_object(C); - EditMesh *em= EM_GetEditMesh(((Mesh *)obedit->data)); + EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data)); EditFace *efa; efa= em->faces.first; @@ -4591,7 +4591,7 @@ static int flip_editnormals(bContext *C, wmOperator *op) /* update vertex normals too */ recalc_editnormals(em); - EM_EndEditMesh(obedit->data, em); + BKE_mesh_end_editmesh(obedit->data, em); return OPERATOR_FINISHED; } |