[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58076] trunk/blender/source/blender/bmesh /tools/bmesh_bevel.c: Fix bevel bugs 34445 and 35109, copying over edge data.

[Howard Trickey]

Revision: 58076
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58076
Author:   howardt
Date:     2013-07-08 13:02:21 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
Fix bevel bugs 34445 and 35109, copying over edge data.

The bugs were about not respecting edge smoothness and
not respecting edge crease.  This change copies the
edge attributes from a beveled edge to the two outside
edges of the bevel.

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-07-08 11:38:11 UTC (rev 58075)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c	2013-07-08 13:02:21 UTC (rev 58076)
@@ -2223,6 +2223,7 @@
 	BMVert *bmv1, *bmv2, *bmv3, *bmv4, *bmv1i, *bmv2i, *bmv3i, *bmv4i;
 	VMesh *vm1, *vm2;
 	EdgeHalf *e1, *e2;
+	BMEdge *bme1, *bme2;
 	BMFace *f1, *f2, *f;
 	int k, nseg, i1, i2, odd, mid;
 
@@ -2294,6 +2295,13 @@
 		bev_merge_end_uvs(bm, bv1, e1);
 	if (!e2->is_seam && bv2->vmesh->mesh_kind == M_NONE)
 		bev_merge_end_uvs(bm, bv2, e2);
+
+	/* Copy edge data to first and last edge */
+	bme1 = BM_edge_exists(bmv1, bmv2);
+	bme2 = BM_edge_exists(bmv3, bmv4);
+	BLI_assert(bme1 && bme2);
+	BM_elem_attrs_copy(bm, bm, bme, bme1);
+	BM_elem_attrs_copy(bm, bm, bme, bme2);
 }
 
 /*