[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58313] trunk/blender/source/blender: correct own incorrect check bmesh edgerin subdivide, also add missing break in orthogonalize_m3 though this one wouldn' t effect release builds.

Campbell Barton ideasman42 at gmail.com
Tue Jul 16 13:39:49 CEST 2013


Revision: 58313
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58313
Author:   campbellbarton
Date:     2013-07-16 11:39:48 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
correct own incorrect check bmesh edgerin subdivide, also add missing break in orthogonalize_m3 though this one wouldn't effect release builds.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/math_matrix.c
    trunk/blender/source/blender/bmesh/operators/bmo_bridge.c
    trunk/blender/source/blender/bmesh/operators/bmo_subdivide_edgering.c

Modified: trunk/blender/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_matrix.c	2013-07-16 08:24:53 UTC (rev 58312)
+++ trunk/blender/source/blender/blenlib/intern/math_matrix.c	2013-07-16 11:39:48 UTC (rev 58313)
@@ -836,6 +836,7 @@
 				normalize_v3(mat[0]);
 				cross_v3_v3v3(mat[1], mat[2], mat[0]);
 			}
+			break;
 		default:
 			BLI_assert(0);
 	}

Modified: trunk/blender/source/blender/bmesh/operators/bmo_bridge.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_bridge.c	2013-07-16 08:24:53 UTC (rev 58312)
+++ trunk/blender/source/blender/bmesh/operators/bmo_bridge.c	2013-07-16 11:39:48 UTC (rev 58313)
@@ -162,7 +162,7 @@
 	}
 
 	if (use_merge) {
-		BLI_assert((el_store_a_len == el_store_a_len));
+		BLI_assert((el_store_a_len == el_store_b_len));
 	}
 
 	if (el_store_a_len != el_store_b_len) {

Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide_edgering.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide_edgering.c	2013-07-16 08:24:53 UTC (rev 58312)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide_edgering.c	2013-07-16 11:39:48 UTC (rev 58313)
@@ -893,7 +893,7 @@
 	/* before going much further, get ourselves in order
 	 * - align loops (not strictly necessary but handy)
 	 * - ensure winding is set for both loops */
-	if (BM_edgeloop_is_closed(el_store_a) && BM_edgeloop_is_closed(el_store_a)) {
+	if (BM_edgeloop_is_closed(el_store_a) && BM_edgeloop_is_closed(el_store_b)) {
 		BMIter eiter;
 		BMEdge *e;
 		BMVert *v_other;




More information about the Bf-blender-cvs mailing list