[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52148] trunk/blender/source/blender/bmesh /operators/bmo_bevel.c: fan filling didnt always work well, now only apply this when its going to work properly.

[Campbell Barton]

Revision: 52148
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52148
Author:   campbellbarton
Date:     2012-11-12 12:30:58 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
fan filling didnt always work well, now only apply this when its going to work properly.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_bevel.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_bevel.c	2012-11-12 12:30:02 UTC (rev 52147)
+++ trunk/blender/source/blender/bmesh/operators/bmo_bevel.c	2012-11-12 12:30:58 UTC (rev 52148)
@@ -664,12 +664,20 @@
 	} while ((e = e->next) != efirst);
 
 	BLI_assert(vm->count >= 2);
-	if (vm->count == 2 && bv->edgecount == 3)
+	if (vm->count == 2 && bv->edgecount == 3) {
 		vm->mesh_kind = M_NONE;
-	else if (efirst->seg == 1 || bv->selcount == 1)
-		vm->mesh_kind = M_FAN;  /* was M_POLY */
-	else
+	}
+	else if (efirst->seg == 1 || bv->selcount == 1) {
+		if (vm->count == 3 && bv->selcount == 1) {
+			vm->mesh_kind = M_FAN;
+		}
+		else {
+			vm->mesh_kind = M_POLY;
+		}
+	}
+	else {
 		vm->mesh_kind = M_ADJ;
+	}
 	/* TODO: if vm->count == 4 and bv->selcount == 4, use M_CROSS pattern */
 }