[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52000] trunk/blender/source/blender/bmesh /intern/bmesh_decimate_collapse.c: decimator - merge flags when collapsing edges / verts, so seams and edges draw flags are kept.

[Campbell Barton]

Revision: 52000
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52000
Author:   campbellbarton
Date:     2012-11-08 07:06:08 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
decimator - merge flags when collapsing edges / verts, so seams and edges draw flags are kept.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_decimate_collapse.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_decimate_collapse.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_decimate_collapse.c	2012-11-08 06:46:10 UTC (rev 51999)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_decimate_collapse.c	2012-11-08 07:06:08 UTC (rev 52000)
@@ -760,8 +760,11 @@
 
 		BM_edge_kill(bm, e_clear);
 
+		v_other->head.hflag |= v_clear->head.hflag;
 		BM_vert_splice(bm, v_clear, v_other);
 
+		e_a_other[1]->head.hflag |= e_a_other[0]->head.hflag;
+		e_b_other[1]->head.hflag |= e_b_other[0]->head.hflag;
 		BM_edge_splice(bm, e_a_other[0], e_a_other[1]);
 		BM_edge_splice(bm, e_b_other[0], e_b_other[1]);
 
@@ -806,8 +809,10 @@
 
 		BM_edge_kill(bm, e_clear);
 
+		v_other->head.hflag |= v_clear->head.hflag;
 		BM_vert_splice(bm, v_clear, v_other);
 
+		e_a_other[1]->head.hflag |= e_a_other[0]->head.hflag;
 		BM_edge_splice(bm, e_a_other[0], e_a_other[1]);
 
 		// BM_mesh_validate(bm);