[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54656] trunk/blender/source/blender/bmesh /intern/bmesh_operators.c: Fix #34249: collapse edges crash blender with a specific mesh

[Sergey Sharybin]

Revision: 54656
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54656
Author:   nazgul
Date:     2013-02-19 09:51:32 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
Fix #34249: collapse edges crash blender with a specific mesh

OpenMP block was using shared variable, which for sure leads to
threading issues.

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

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2013-02-19 09:41:48 UTC (rev 54655)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2013-02-19 09:51:32 UTC (rev 54656)
@@ -595,13 +595,13 @@
 
 	const char flag_types[3] = {BM_VERT, BM_EDGE, BM_FACE};
 
-	BMIter iter;
 	BMElemF *ele;
 	int i;
 
 #pragma omp parallel for schedule(dynamic) if (bm->totvert + bm->totedge + bm->totface >= BM_OMP_LIMIT)
 	for (i = 0; i < 3; i++) {
 		if (htype & flag_types[i]) {
+			BMIter iter;
 			BM_ITER_MESH (ele, &iter, bm, iter_types[i]) {
 				BMO_elem_flag_disable(bm, ele, oflag);
 			}