[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44448] trunk/blender/source/blender/bmesh : change vertex dissolve not to collapse edges when its only connected to 2 , rather then joining the faces on either side.

[Campbell Barton]

Revision: 44448
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44448
Author:   campbellbarton
Date:     2012-02-26 05:04:30 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
    trunk/blender/source/blender/bmesh/tools/BME_bevel.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c	2012-02-26 04:40:56 UTC (rev 44447)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c	2012-02-26 05:04:30 UTC (rev 44448)
@@ -334,7 +334,7 @@
 			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;
 			}
 

Modified: trunk/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/BME_bevel.c	2012-02-26 04:40:56 UTC (rev 44447)
+++ trunk/blender/source/blender/bmesh/tools/BME_bevel.c	2012-02-26 05:04:30 UTC (rev 44448)
@@ -153,6 +153,9 @@
 
 		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;