diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-09-09 09:42:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-09 09:42:26 +0400 |
commit | 00bd7da6745d8f8aa9ec7327f38ed6ac253beba7 (patch) | |
tree | 98a1e4ce39676173660a882ecbe591278e646a2b /source/blender/bmesh | |
parent | 66efedd09659d94a11c995d2fda16a9c13dc65a8 (diff) |
correct error in recent changes for building with openmp.
rename DM_OMP_LIMIT to BKE_MESH_OMP_LIMIT and set to 0 when in debug mode, same for BM_OMP_LIMIT.
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/bmesh_class.h | 8 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_normals.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h index 5b79bd78061..90105b0dd81 100644 --- a/source/blender/bmesh/bmesh_class.h +++ b/source/blender/bmesh/bmesh_class.h @@ -292,6 +292,12 @@ typedef bool (*BMElemFilterFunc)(BMElem *, void *user_data); * but should not error on valid cases */ #define BM_LOOP_RADIAL_MAX 10000 #define BM_NGON_MAX 100000 -#define BM_OMP_LIMIT 10000 /* 10000 */ /* setting zero so we can catch bugs in OpenMP/BMesh */ + +/* setting zero so we can catch bugs in OpenMP/BMesh */ +#ifdef DEBUG +# define BM_OMP_LIMIT 0 +#else +# define BM_OMP_LIMIT 10000 +#endif #endif /* __BMESH_CLASS_H__ */ diff --git a/source/blender/bmesh/operators/bmo_normals.c b/source/blender/bmesh/operators/bmo_normals.c index 93d7d1ad2c0..1eaa0695ad2 100644 --- a/source/blender/bmesh/operators/bmo_normals.c +++ b/source/blender/bmesh/operators/bmo_normals.c @@ -47,7 +47,7 @@ static bool bmo_recalc_normal_edge_filter_cb(BMElem *ele, void *UNUSED(user_data } /** - * Given an array of faces, recalcualte their normals. + * Given an array of faces, recalculate their normals. * this functions assumes all faces in the array are connected by edges. * * \param bm |