[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44163] branches/bmesh/blender/source/ blender/bmesh/operators/bmo_join_triangles.c: fix [#30209] "Tris to Quad" fails in some cases

Campbell Barton ideasman42 at gmail.com
Thu Feb 16 18:43:26 CET 2012


Revision: 44163
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44163
Author:   campbellbarton
Date:     2012-02-16 17:43:23 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
fix [#30209] "Tris to Quad" fails in some cases

dont join 2 triangles if the edge thet share has more then 2 face users.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/operators/bmo_join_triangles.c

Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmo_join_triangles.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bmo_join_triangles.c	2012-02-16 16:46:52 UTC (rev 44162)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmo_join_triangles.c	2012-02-16 17:43:23 UTC (rev 44163)
@@ -249,7 +249,7 @@
 		if (!BMO_elem_flag_test(bm, e, EDGE_MARK))
 			continue;
 
-		if (BM_edge_face_count(e) < 2) {
+		if (BM_edge_face_count(e) != 2) {
 			BMO_elem_flag_disable(bm, e, EDGE_MARK);
 			continue;
 		}




More information about the Bf-blender-cvs mailing list