[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60264] trunk/blender/source/blender/bmesh /tools/bmesh_bevel.c: Let vertex bevel work on boundary verts of polys.

[Howard Trickey]

Revision: 60264
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60264
Author:   howardt
Date:     2013-09-20 12:50:34 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
Let vertex bevel work on boundary verts of polys.
Suggestion by Jonathan Williamson, and thanks to
Walid Shouman for noticing that the existing code
worked if a test to prohibit it were removed.

Limitation: treats segments > 1 the same as
segments == 1 in this case; a TODO to do
something more intelligent.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c

Modified: trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c	2013-09-20 12:50:27 UTC (rev 60263)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c	2013-09-20 12:50:34 UTC (rev 60264)
@@ -900,7 +900,12 @@
 
 	BLI_assert(vm->count >= 2);
 	if (bp->vertex_only) {
-		vm->mesh_kind = bp->seg > 1 ? M_ADJ_SUBDIV : M_POLY;
+		if (vm->count == 2)
+			vm->mesh_kind = M_NONE;
+		else if (bp->seg > 1)
+			vm->mesh_kind = M_ADJ_SUBDIV;
+		else
+			vm->mesh_kind = M_POLY;
 	}
 	else if (vm->count == 2 && bv->edgecount == 3) {
 		vm->mesh_kind = M_NONE;
@@ -1962,7 +1967,7 @@
 	if (!first_bme)
 		first_bme = v->e;
 
-	if ((nsel == 0 && !bp->vertex_only) || (ntot < 3 && bp->vertex_only)) {
+	if ((nsel == 0 && !bp->vertex_only) || (ntot < 2 && bp->vertex_only)) {
 		/* signal this vert isn't being beveled */
 		BM_elem_flag_disable(v, BM_ELEM_TAG);
 		return;