[Bf-blender-cvs] [45b9822] master: Fix T38300: Bevel didn't always reconstruct faces properly.

[Howard Trickey]

Commit: 45b9822259475fa6f738ca3d0f07f41bfa03b3f9
Author: Howard Trickey
Date:   Tue Jan 21 08:58:56 2014 -0500
https://developer.blender.org/rB45b9822259475fa6f738ca3d0f07f41bfa03b3f9

Fix T38300: Bevel didn't always reconstruct faces properly.

With new subdivision method for making the vertex mesh, we always
subdivide the edges between the new vertices around a vertex
(we used to not subdivide edges between two non-beveled edges).
This fixes a bug related to this change.

===================================================================

M	source/blender/bmesh/tools/bmesh_bevel.c

===================================================================

diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 3f71a6a..98e8c79 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -3317,7 +3317,7 @@ static int bev_rebuild_polygon(BMesh *bm, BevelParams *bp, BMFace *f)
 							BLI_array_append(vv_fix, bmv);
 					}
 				}
-				else if (bp->vertex_only && vm->mesh_kind == M_ADJ_SUBDIV && vm->seg > 1) {
+				else if (vm->mesh_kind == M_ADJ_SUBDIV && vm->seg > 1 && !e->is_bev && !eprev->is_bev) {
 					BLI_assert(v->prev == vend);
 					i = vend->index;
 					for (k = vm->seg - 1; k > 0; k--) {