Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-02-26 09:04:30 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-26 09:04:30 +0400
commitff7ddb1925c5a0bf64d3a353980e771266ebd1bf (patch)
tree3f2508f8cc243f98ee3492e421684b172fa1b3da /source
parentc5066df30773af37caf0cd532fb94d876c2ff176 (diff)
change vertex dissolve not to collapse edges when its only connected to 2, rather then joining the faces on either side.
This way. IMHO is more useful since it means you can simplify the geometry between faces without joining them and it distinguishes vertex dissolve more from edge dissolve - which will join both faces still.
Diffstat (limited to 'source')
-rw-r--r--source/blender/bmesh/operators/bmo_dissolve.c2
-rw-r--r--source/blender/bmesh/tools/BME_bevel.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c
index ddef478a4aa..62c98dc2871 100644
--- a/source/blender/bmesh/operators/bmo_dissolve.c
+++ b/source/blender/bmesh/operators/bmo_dissolve.c
@@ -334,7 +334,7 @@ void dissolveverts_exec(BMesh *bm, BMOperator *op)
if (BM_vert_edge_count(v) == 2) {
/* collapse the ver */
- BM_vert_collapse_faces(bm, v->e, v, 1.0f, TRUE);
+ BM_vert_collapse_faces(bm, v->e, v, 1.0f, FALSE);
continue;
}
diff --git a/source/blender/bmesh/tools/BME_bevel.c b/source/blender/bmesh/tools/BME_bevel.c
index 144a0f7ea5e..903500b2b06 100644
--- a/source/blender/bmesh/tools/BME_bevel.c
+++ b/source/blender/bmesh/tools/BME_bevel.c
@@ -153,6 +153,9 @@ static int BME_Bevel_Dissolve_Disk(BMesh *bm, BMVert *v)
e = v->e;
elast = bmesh_disk_nextedge(e, v);
+
+ /* BMESH_TODO, figure out if its possible we had a double edge here and need to splice it,
+ * last bool arg */
bmesh_jekv(bm, e, v, FALSE);
l1 = elast->l;