[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57236] trunk/blender/source/blender/bmesh : fix for own error in recent bridge changes, make sure normals are calculated before use.

[Campbell Barton]

Revision: 57236
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57236
Author:   campbellbarton
Date:     2013-06-04 17:46:19 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
fix for own error in recent bridge changes, make sure normals are calculated before use.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_edgeloop.c
    trunk/blender/source/blender/bmesh/operators/bmo_bridge.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_edgeloop.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_edgeloop.c	2013-06-04 17:20:00 UTC (rev 57235)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_edgeloop.c	2013-06-04 17:46:19 UTC (rev 57236)
@@ -426,6 +426,10 @@
 		const float *co = ((BMEdgeLoopStore *)eloops_ordered.last)->co;
 		const float *no = ((BMEdgeLoopStore *)eloops_ordered.last)->no;
 		float len_best = FLT_MAX;
+
+		if (use_normals)
+			BLI_assert(fabsf(len_squared_v3(no) - 1.0f) < FLT_EPSILON);
+
 		for (el_store = eloops->first; el_store; el_store = el_store->next) {
 			float len;
 			if (use_normals) {

Modified: trunk/blender/source/blender/bmesh/operators/bmo_bridge.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_bridge.c	2013-06-04 17:20:00 UTC (rev 57235)
+++ trunk/blender/source/blender/bmesh/operators/bmo_bridge.c	2013-06-04 17:46:19 UTC (rev 57236)
@@ -488,6 +488,9 @@
 	}
 
 	if (count > 2) {
+		if (use_pairs) {
+			BM_mesh_edgeloops_calc_normal(bm, &eloops);
+		}
 		BM_mesh_edgeloops_calc_order(bm, &eloops, use_pairs);
 	}