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

replace function in commented code incase we want to bring it back

Browse Source
This commit is contained in:
Campbell Barton
2011-12-07 21:55:59 +00:00
parent c5e6b44748
commit 1ec4629d88
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/bmesh/intern/bmesh_mods.c
View File

@@ -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

12
source/blender/bmesh/tools/BME_bevel.c
View File

@@ -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);
}
}