From 1ec4629d88e14e91edcbfbac4fcae6325f08f31f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 7 Dec 2011 21:55:59 +0000 Subject: [PATCH] replace function in commented code incase we want to bring it back --- source/blender/bmesh/intern/bmesh_mods.c | 2 +- source/blender/bmesh/tools/BME_bevel.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 82fcaa6928d..fe0cf36341b 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -230,7 +230,7 @@ void BM_Dissolve_Disk(BMesh *bm, BMVert *v) } }; } - BM_Collapse_Vert(bm, v->e, v, 1.0); + BM_Collapse_Vert_Faces(bm, v->e, v, 1.0); } } #endif diff --git a/source/blender/bmesh/tools/BME_bevel.c b/source/blender/bmesh/tools/BME_bevel.c index 3b0e0d48e33..9af4e4797e5 100644 --- a/source/blender/bmesh/tools/BME_bevel.c +++ b/source/blender/bmesh/tools/BME_bevel.c @@ -436,9 +436,9 @@ static BMVert *BME_bevel_wire(BMesh *bm, BMVert *v, float value, int res, int op if (res) { bmesh_jekv; - //void BM_Collapse_Vert(BMesh *bm, BMEdge *ke, BMVert *kv, float fac, int calcnorm){ + //void BM_Collapse_Vert_Faces(BMesh *bm, BMEdge *ke, BMVert *kv, float fac, int calcnorm){ //hrm, why is there a fac here? it just removes a vert - BM_Collapse_Vert(bm, v->e, v, 1.0, 0); + BM_Collapse_Vert_Faces(bm, v->e, v, 1.0, 0); //bmesh_jekv(bm,v->e,v); } @@ -486,14 +486,14 @@ static BMLoop *BME_bevel_edge(BMesh *bm, BMLoop *l, float value, int options, fl if (kl->v == kv) { BM_Split_Face(bm,kl->f,kl->prev->v,kl->next->v,&nl,kl->prev->e); bmesh_jfke(bm, kl->prev->radial_next->f,kl->f,kl->prev->e); - BM_Collapse_Vert(bm, kl->e, kv, 1.0); + BM_Collapse_Vert_Faces(bm, kl->e, kv, 1.0); //BME_JEKV(bm,kl->e,kv); } else { BM_Split_Face(bm,kl->f,kl->next->next->v,kl->v,&nl,kl->next->e); bmesh_jfke(bm, kl->next->radial_next->f,kl->f,kl->next->e); - BM_Collapse_Vert(bm, kl->e, kv, 1.0); + BM_Collapse_Vert_Faces(bm, kl->e, kv, 1.0); //BME_JEKV(bm,kl->e,kv); } l = l->prev; @@ -523,13 +523,13 @@ static BMLoop *BME_bevel_edge(BMesh *bm, BMLoop *l, float value, int options, fl if (kl->v == kv) { BM_Split_Face(bm,kl->f,kl->prev->v,kl->next->v,&nl,kl->prev->e); bmesh_jfke(bm,kl->prev->radial_next->f,kl->f,kl->prev->e); - BM_Collapse_Vert(bm, kl->e, kv, 1.0); + BM_Collapse_Vert_Faces(bm, kl->e, kv, 1.0); //BME_JEKV(bm,kl->e,kv); } else { BM_Split_Face(bm,kl->f,kl->next->next->v,kl->v,&nl,kl->next->e); bmesh_jfke(bm, kl->next->radial_next->f,kl->f,kl->next->e); - BM_Collapse_Vert(bm, kl->e, kv, 1.0); + BM_Collapse_Vert_Faces(bm, kl->e, kv, 1.0); //BME_JEKV(bm,kl->e,kv); } }