diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-20 02:17:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-20 02:17:30 +0400 |
commit | a368e6771a5f707f41f5959c345943cad07ef7e8 (patch) | |
tree | 818fb646c7651482c400f861fd789078ebaa4e72 /source/blender/editors | |
parent | be674afdadaa1ab966147755e224e8bbda6807db (diff) |
- remove some unused editmesh functions.
- copy & rename EditMesh stricts for use with scanfill (remove unused members)
Diffstat (limited to 'source/blender/editors')
53 files changed, 54 insertions, 146 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index e16063b50c6..28d3fa6e170 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -38,6 +38,7 @@ #include "DNA_anim_types.h" +#include "DNA_mesh_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" #include "DNA_meshdata_types.h" @@ -48,7 +49,6 @@ #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_editVert.h" #include "BLI_ghash.h" #include "BKE_animsys.h" diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c index a8978a0bbde..f1ea39e45b9 100644 --- a/source/blender/editors/armature/editarmature_retarget.c +++ b/source/blender/editors/armature/editarmature_retarget.c @@ -43,7 +43,6 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_graph.h" diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index bb493d3fec4..e2b89ba90e1 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -53,7 +53,6 @@ #ifdef RIGID_DEFORM -#include "BLI_editVert.h" #include "BLI_polardecomp.h" #endif diff --git a/source/blender/editors/mesh/bmesh_utils.c b/source/blender/editors/mesh/bmesh_utils.c index f124823b106..29404a6e46a 100644 --- a/source/blender/editors/mesh/bmesh_utils.c +++ b/source/blender/editors/mesh/bmesh_utils.c @@ -27,6 +27,7 @@ #include "MEM_guardedalloc.h" +#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index bec1403a8dd..65a34e2d1b3 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -38,11 +38,11 @@ #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_edgehash.h" -#include "BLI_editVert.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c index 8e56a357487..1b8e90ffce7 100755 --- a/source/blender/editors/mesh/knifetool.c +++ b/source/blender/editors/mesh/knifetool.c @@ -54,9 +54,9 @@ #include "WM_types.h" #include "DNA_scene_types.h" +#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "BKE_tessmesh.h" -#include "BLI_editVert.h" #include "mesh_intern.h" @@ -1802,8 +1802,8 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) for (i = 0; i < totface; i++) { SmallHash *hash = &shash; - EditFace *efa; - EditVert *eve, *lasteve; + ScanFillFace *efa; + ScanFillVert *eve, *lasteve; int j; float rndscale = FLT_EPSILON * 25; @@ -1818,7 +1818,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) for (entry = face_nets[i].first; entry; entry = entry->next) { if (!BLI_smallhash_haskey(hash, (intptr_t)entry->kfe->v1)) { eve = BLI_addfillvert(entry->kfe->v1->v->co); - eve->xs = 0; + eve->poly_nr = 0; rnd_offset_co(eve->co, rndscale); eve->tmp.p = entry->kfe->v1->v; BLI_smallhash_insert(hash, (intptr_t)entry->kfe->v1, eve); @@ -1826,7 +1826,7 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) if (!BLI_smallhash_haskey(hash, (intptr_t)entry->kfe->v2)) { eve = BLI_addfillvert(entry->kfe->v2->v->co); - eve->xs = 0; + eve->poly_nr = 0; rnd_offset_co(eve->co, rndscale); eve->tmp.p = entry->kfe->v2->v; BLI_smallhash_insert(hash, (intptr_t)entry->kfe->v2, eve); @@ -1837,16 +1837,16 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) lasteve = BLI_smallhash_lookup(hash, (intptr_t)entry->kfe->v1); eve = BLI_smallhash_lookup(hash, (intptr_t)entry->kfe->v2); - eve->xs++; - lasteve->xs++; + eve->poly_nr++; + lasteve->poly_nr++; } for (j = 0, entry = face_nets[i].first; entry; entry = entry->next, j++) { lasteve = BLI_smallhash_lookup(hash, (intptr_t)entry->kfe->v1); eve = BLI_smallhash_lookup(hash, (intptr_t)entry->kfe->v2); - if (eve->xs > 1 && lasteve->xs > 1) { - EditEdge *eed; + if (eve->poly_nr > 1 && lasteve->poly_nr > 1) { + ScanFillEdge *eed; eed = BLI_addfilledge(lasteve, eve); if (entry->kfe->oe) eed->f = FILLBOUNDARY; /* mark as original boundary edge */ @@ -1855,9 +1855,9 @@ static void knifenet_fill_faces(knifetool_opdata *kcd) BMO_elem_flag_disable(bm, entry->kfe->e->v2, DEL); } else { - if (lasteve->xs < 2) + if (lasteve->poly_nr < 2) BLI_remlink(&fillvertbase, lasteve); - if (eve->xs < 2) + if (eve->poly_nr < 2) BLI_remlink(&fillvertbase, eve); } } diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c index 59861d674f2..794356510aa 100644 --- a/source/blender/editors/mesh/loopcut.c +++ b/source/blender/editors/mesh/loopcut.c @@ -38,6 +38,7 @@ #include "DNA_ID.h" #include "DNA_object_types.h" +#include "DNA_mesh_types.h" #include "DNA_screen_types.h" #include "DNA_scene_types.h" #include "DNA_userdef_types.h" @@ -50,7 +51,6 @@ #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_dynstr.h" /*for WM_operator_pystring */ -#include "BLI_editVert.h" #include "BLI_utildefines.h" #include "BKE_blender.h" diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 0d7d6ca8108..c35bf8988b7 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -36,6 +36,7 @@ #include "MEM_guardedalloc.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -44,7 +45,6 @@ #include "BLI_utildefines.h" #include "BLI_array.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_edgehash.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index 58ad32fad4d..6b0ed5c14d6 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -90,31 +90,6 @@ float labda_PdistVL2Dfl(const float v1[3], const float v2[3], const float v3[3]) /* ******************** editface.c */ -#if 0 /* REMOVE AFTER BMESH MERGE */ - -/* ******************* editmesh.c */ - -extern void free_editvert(EditMesh *em, EditVert *eve); -extern void free_editedge(EditMesh *em, EditEdge *eed); -extern void free_editface(EditMesh *em, EditFace *efa); - -/*frees dst mesh, then copies the contents of - *src (the struct) to dst. */ -void set_editMesh(EditMesh *dst, EditMesh *src); - -extern void free_vertlist(EditMesh *em, ListBase *edve); -extern void free_edgelist(EditMesh *em, ListBase *lb); -extern void free_facelist(EditMesh *em, ListBase *lb); - -extern void remedge(EditMesh *em, EditEdge *eed); - -extern struct EditVert *addvertlist(EditMesh *em, float *vec, struct EditVert *example); -extern struct EditEdge *addedgelist(EditMesh *em, struct EditVert *v1, struct EditVert *v2, struct EditEdge *example); -extern struct EditFace *addfacelist(EditMesh *em, struct EditVert *v1, struct EditVert *v2, struct EditVert *v3, struct EditVert *v4, struct EditFace *example, struct EditFace *exampleEdges); -extern struct EditEdge *findedgelist(EditMesh *em, struct EditVert *v1, struct EditVert *v2); - -#endif - void em_setup_viewcontext(struct bContext *C, struct ViewContext *vc); void MESH_OT_separate(struct wmOperatorType *ot); @@ -137,58 +112,6 @@ void MESH_OT_duplicate(struct wmOperatorType *ot); void MESH_OT_fgon_make(struct wmOperatorType *ot); void MESH_OT_fgon_clear(struct wmOperatorType *ot); -#if 0 /* REMOVE AFTER BMESH MERGE */ - -/* ******************* editmesh_lib.c */ -void EM_stats_update(EditMesh *em); - -extern void EM_fgon_flags(EditMesh *em); -extern void EM_hide_reset(EditMesh *em); - -extern int faceselectedOR(EditFace *efa, int flag); -extern int faceselectedAND(EditFace *efa, int flag); - -void EM_remove_selection(EditMesh *em, void *data, int type); -void EM_clear_flag_all(EditMesh *em, int flag); -void EM_set_flag_all(EditMesh *em, int flag); -void EM_set_flag_all_selectmode(EditMesh *em, int flag); - -void EM_data_interp_from_verts(EditMesh *em, EditVert *v1, EditVert *v2, EditVert *eve, float fac); -void EM_data_interp_from_faces(EditMesh *em, EditFace *efa1, EditFace *efa2, EditFace *efan, int i1, int i2, int i3, int i4); - -int EM_nvertices_selected(EditMesh *em); -int EM_nedges_selected(EditMesh *em); -int EM_nfaces_selected(EditMesh *em); - -float EM_face_perimeter(EditFace *efa); - -void EM_store_selection(EditMesh *em, void *data, int type); - -extern EditFace *exist_face(EditMesh *em, EditVert *v1, EditVert *v2, EditVert *v3, EditVert *v4); -extern void flipface(EditMesh *em, EditFace *efa); // flips for normal direction -extern int compareface(EditFace *vl1, EditFace *vl2); - -/* flag for selection bits, *nor will be filled with normal for extrusion constraint */ -/* return value defines if such normal was set */ -extern short extrudeflag_face_indiv(EditMesh *em, short flag, float *nor); -extern short extrudeflag_verts_indiv(EditMesh *em, short flag, float *nor); -extern short extrudeflag_edges_indiv(EditMesh *em, short flag, float *nor); -extern short extrudeflag_vert(Object *obedit, EditMesh *em, short flag, float *nor, int all); -extern short extrudeflag(Object *obedit, EditMesh *em, short flag, float *nor, int all); - -extern void adduplicateflag(EditMesh *em, int flag); -extern void delfaceflag(EditMesh *em, int flag); - -extern void rotateflag(EditMesh *em, short flag, float *cent, float rotmat[][3]); -extern void translateflag(EditMesh *em, short flag, float *vec); - -extern int convex(float *v1, float *v2, float *v3, float *v4); - -extern struct EditFace *EM_face_from_faces(EditMesh *em, struct EditFace *efa1, - struct EditFace *efa2, int i1, int i2, int i3, int i4); - -#endif - extern int EM_view3d_poll(struct bContext *C); struct wmKeyMap* knifetool_modal_keymap(struct wmKeyConfig *keyconf); diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c index 99947cb9ae2..cb4f7a37130 100644 --- a/source/blender/editors/mesh/mesh_navmesh.c +++ b/source/blender/editors/mesh/mesh_navmesh.c @@ -48,7 +48,6 @@ #include "BKE_report.h" #include "BKE_tessmesh.h" -#include "BLI_editVert.h" #include "BLI_listbase.h" #include "BLI_utildefines.h" #include "BLI_math_vector.h" diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 4bc500fcdab..c3f749b2c45 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -38,7 +38,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BKE_context.h" diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 1b5011402fc..bad0718c613 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -41,6 +41,7 @@ #include "MEM_guardedalloc.h" +#include "DNA_mesh_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" #include "DNA_meshdata_types.h" @@ -50,7 +51,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLI_editVert.h" #include "BLI_ghash.h" #include "BLI_rand.h" /* for randome face sorting */ #include "BLI_threads.h" diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index a28b5c4feaa..b0d99ddd788 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -40,7 +40,6 @@ #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_editVert.h" #include "BLI_ghash.h" #include "BLI_rand.h" @@ -56,6 +55,7 @@ #include "DNA_object_force.h" #include "DNA_meshdata_types.h" #include "DNA_vfont_types.h" +#include "DNA_mesh_types.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 2083c51efa9..8b5a9ae6c9b 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -34,13 +34,13 @@ #include "MEM_guardedalloc.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_utildefines.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index e8a09732313..547c5b24778 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -46,7 +46,6 @@ #include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_path_util.h" -#include "BLI_editVert.h" #include "BLI_utildefines.h" #include "BKE_animsys.h" diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index f64f25391f9..1a226112db4 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -35,6 +35,7 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" +#include "DNA_mesh_types.h" #include "DNA_constraint_types.h" #include "DNA_group_types.h" #include "DNA_lamp_types.h" @@ -48,7 +49,6 @@ #include "DNA_object_types.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 68c017adecd..aac8ef4c5e3 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -34,13 +34,13 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_key_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_group_types.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_listbase.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 78d90bb39d2..bad89b5b137 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -207,13 +207,13 @@ static int ED_vgroup_give_parray(ID *id, MDeformVert ***dvert_arr, int *dvert_to if (use_vert_sel) { BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { (*dvert_arr)[i] = BM_elem_flag_test(eve, BM_ELEM_SELECT) ? - CustomData_em_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT) : NULL; + CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT) : NULL; i++; } } else { BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - (*dvert_arr)[i] = CustomData_em_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); + (*dvert_arr)[i] = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_MDEFORMVERT); i++; } } diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 13383445c93..4b4d7354898 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -37,7 +37,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_dlrbTree.h" #include "BLI_utildefines.h" #include "BLI_jitter.h" diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 83b4dfef6c6..dd7038716c4 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -31,6 +31,7 @@ #include "MEM_guardedalloc.h" +#include "DNA_mesh_types.h" #include "DNA_curve_types.h" #include "DNA_lamp_types.h" #include "DNA_material_types.h" @@ -43,7 +44,6 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_utildefines.h" #include "BKE_animsys.h" diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 22bac3a6699..039b1c2f866 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -34,7 +34,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_dlrbTree.h" #include "BLI_utildefines.h" @@ -44,6 +43,7 @@ #include "DNA_curve_types.h" #include "DNA_scene_types.h" #include "DNA_meta_types.h" +#include "DNA_mesh_types.h" #include "DNA_userdef_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 681ab3a1492..980a6b44e4e 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -50,7 +50,6 @@ #include "BLI_memarena.h" #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLI_editVert.h" #include "PIL_time.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 2bff8476ea9..8c8c2da1712 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -42,9 +42,9 @@ #include "BLI_ghash.h" #include "BLI_pbvh.h" #include "BLI_threads.h" -#include "BLI_editVert.h" #include "BLI_rand.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index ce07beae674..11e926fb065 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -34,13 +34,13 @@ #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" -#include "BLI_editVert.h" #include "BLI_math.h" #include "BLI_ghash.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_brush_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "BKE_brush.h" diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 9e1ff82c20d..e2ea6849a72 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -42,7 +42,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_graph/graph_utils.c b/source/blender/editors/space_graph/graph_utils.c index e7dc5e8408c..8925866df8d 100644 --- a/source/blender/editors/space_graph/graph_utils.c +++ b/source/blender/editors/space_graph/graph_utils.c @@ -42,7 +42,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_rand.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 43bea1c311d..150872813b2 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -41,7 +41,6 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index dd988c94dc9..ce7338ced13 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -32,6 +32,7 @@ #include <string.h> #include <stdio.h> +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -40,7 +41,6 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index 38d99c084b3..cf003d8c1eb 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -34,6 +34,7 @@ #include "DNA_curve_types.h" #include "DNA_group_types.h" #include "DNA_lattice_types.h" +#include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_scene_types.h" @@ -53,7 +54,6 @@ #include "ED_armature.h" #include "ED_mesh.h" -#include "BLI_editVert.h" typedef struct SceneStats { int totvert, totvertsel; diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 79d11c956cd..fc42d9fa966 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -42,7 +42,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_rand.h" #include "BLF_translation.h" diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 09a4a9eb749..ca647d9962a 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -36,10 +36,10 @@ #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_edgehash.h" -#include "BLI_editVert.h" #include "BLI_utildefines.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 8baba5a1ee2..1ef2226941e 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -39,6 +39,7 @@ #include "DNA_lamp_types.h" #include "DNA_lattice_types.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_meta_types.h" #include "DNA_scene_types.h" @@ -50,7 +51,6 @@ #include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_edgehash.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index 61b4260450b..2ab4491baa2 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -41,7 +41,6 @@ #include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_edgehash.h" #include "BLI_rand.h" diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 98301e63705..35145064169 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -38,6 +38,7 @@ #include "DNA_curve_types.h" #include "DNA_lattice_types.h" #include "DNA_meta_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -46,7 +47,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 0a942a42540..9bbf4744b8c 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -35,6 +35,7 @@ #include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_mesh_types.h" #include "RNA_access.h" @@ -42,7 +43,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_utildefines.h" #include "BLF_translation.h" diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index ec6d1bdbe87..079db789a3c 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -39,6 +39,7 @@ #include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_meta_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -48,7 +49,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_rand.h" #include "BLI_linklist.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 087ed8380d6..9d2f549458f 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -38,13 +38,13 @@ #include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" +#include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_scene_types.h" #include "DNA_object_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_linklist.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index 86a2abe7a74..e14946da28a 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -41,7 +41,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_rand.h" #include "BLI_utildefines.h" #include "BLI_ghash.h" diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index d15d6b8b3bc..dfdbf852305 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -47,6 +47,7 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" /* PET modes */ @@ -81,7 +82,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLI_editVert.h" #include "BLI_ghash.h" #include "BLI_linklist.h" #include "BLI_smallhash.h" diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 13f7d279da9..0226ccc4938 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -38,7 +38,6 @@ #include "DNA_listBase.h" -#include "BLI_editVert.h" #include "BLI_smallhash.h" #include "BKE_tessmesh.h" diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 5158f2beada..abbe2db9f19 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -41,6 +41,7 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_lattice_types.h" +#include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_node_types.h" #include "DNA_screen_types.h" @@ -103,7 +104,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_array.h" #include "BLI_utildefines.h" #include "BLI_smallhash.h" @@ -290,7 +290,7 @@ static void createTransTexspace(TransInfo *t) if (give_obdata_texspace(ob, &texflag, &td->loc, &td->ext->size, &td->ext->rot)) { ob->dtx |= OB_TEXSPACE; - *texflag &= ~AUTOSPACE; + *texflag &= ~ME_AUTOSPACE; } copy_v3_v3(td->iloc, td->loc); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 4073081ffc2..8013520639e 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -44,6 +44,7 @@ #include "DNA_space_types.h" #include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_view3d_types.h" #include "DNA_modifier_types.h" @@ -92,7 +93,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index f95856b2373..67a0d5dbe04 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -46,6 +46,7 @@ #include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" +#include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_screen_types.h" #include "DNA_scene_types.h" @@ -63,7 +64,6 @@ #include "BKE_tessmesh.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_utildefines.h" #include "BIF_gl.h" diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 33f3ad45a08..5f83bb4c29c 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -32,6 +32,7 @@ #include "DNA_armature_types.h" #include "DNA_curve_types.h" +#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" @@ -46,7 +47,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_utildefines.h" #include "BLF_translation.h" diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 183ade56cf0..d08c7f65e2d 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -40,6 +40,7 @@ #include "DNA_armature_types.h" #include "DNA_scene_types.h" #include "DNA_object_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" // Temporary, for snapping to other unselected meshes #include "DNA_space_types.h" #include "DNA_screen_types.h" @@ -49,7 +50,6 @@ #include "RNA_access.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/util/crazyspace.c b/source/blender/editors/util/crazyspace.c index ae4f99414bd..5ead0959d5c 100644 --- a/source/blender/editors/util/crazyspace.c +++ b/source/blender/editors/util/crazyspace.c @@ -35,6 +35,7 @@ #include "DNA_scene_types.h" #include "DNA_object_types.h" #include "DNA_modifier_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "BKE_DerivedMesh.h" @@ -45,7 +46,6 @@ #include "BLI_utildefines.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "ED_util.h" diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 7f301123ab8..61b1dece957 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -35,12 +35,12 @@ #include "MEM_guardedalloc.h" +#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_packedFile_types.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 56a835beeb8..6ab68d2261e 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -37,10 +37,10 @@ #include "MEM_guardedalloc.h" +#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_dynstr.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c index 9759ab447f6..20ff8b07bc6 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.c +++ b/source/blender/editors/uvedit/uvedit_buttons.c @@ -32,6 +32,7 @@ #include "MEM_guardedalloc.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -40,7 +41,6 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index ca8f1e4fb97..8de03f330d9 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -43,7 +43,6 @@ #include "DNA_space_types.h" #include "BLI_math.h" -#include "BLI_editVert.h" #include "BLI_utildefines.h" #include "BKE_DerivedMesh.h" diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 0df2a70302a..df1c9c48f99 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -39,6 +39,7 @@ #include "DNA_object_types.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_image_types.h" @@ -47,7 +48,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_array.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 70971e43409..b63cb458c0a 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -37,10 +37,10 @@ #include "MEM_guardedalloc.h" #include "DNA_object_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_scene_types.h" -#include "BLI_editVert.h" #include "BLI_ghash.h" #include "BLI_math.h" #include "BLI_math_vector.h" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 6d15d023fbe..c2bcb290865 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -37,6 +37,7 @@ #include "MEM_guardedalloc.h" #include "DNA_camera_types.h" +#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -45,7 +46,6 @@ #include "BLI_utildefines.h" #include "BLI_math.h" #include "BLI_edgehash.h" -#include "BLI_editVert.h" #include "BLI_uvproject.h" #include "BLI_utildefines.h" #include "BLI_rand.h" @@ -64,7 +64,6 @@ #include "BLI_math.h" #include "BLI_edgehash.h" -#include "BLI_editVert.h" #include "BLI_scanfill.h" #include "BLI_array.h" #include "BLI_uvproject.h" @@ -213,8 +212,8 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, BM_mesh_elem_index_ensure(em->bm, BM_VERT); BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { - EditVert *v, *lastv, *firstv; - EditFace *sefa; + ScanFillVert *v, *lastv, *firstv; + ScanFillFace *sefa; ParamKey key, vkeys[4]; ParamBool pin[4], select[4]; BMLoop *ls[3]; @@ -226,7 +225,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, if((BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) || (sel && BM_elem_flag_test(efa, BM_ELEM_SELECT)==0)) continue; - /* tf= (MTexPoly *)CustomData_em_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ + /* tf= (MTexPoly *)CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); */ /* UNUSED */ lsel = 0; BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) { @@ -414,7 +413,7 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, BMEditMesh *e numOfEdges = derivedMesh->getNumEdges(derivedMesh); numOfFaces = derivedMesh->getNumTessFaces(derivedMesh); - faceMap = MEM_mallocN(numOfFaces*sizeof(EditFace *), "unwrap_edit_face_map"); + faceMap = MEM_mallocN(numOfFaces*sizeof(BMFace *), "unwrap_edit_face_map"); BM_mesh_elem_index_ensure(em->bm, BM_VERT); EDBM_init_index_arrays(em, 0, 1, 1); @@ -423,7 +422,7 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, BMEditMesh *e for(i = 0; i < numOfFaces; i++) faceMap[i] = EDBM_get_face_for_index(em, origFaceIndices[i]); - edgeMap = MEM_mallocN(numOfEdges*sizeof(EditEdge *), "unwrap_edit_edge_map"); + edgeMap = MEM_mallocN(numOfEdges*sizeof(BMEdge *), "unwrap_edit_edge_map"); /* map subsurfed edges to original editEdges */ for(i = 0; i < numOfEdges; i++) { |