Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2015-07-10 10:55:01 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-07-10 10:56:10 +0300
commitbbcbd2eed9081e0c1127d32e41592a8dc6b5604b (patch)
treee2e5d9e7865f05ffe27ab622f50bd425c216a35a
parenta8b8d60c50280026d58e06e6ec8cdb73cced97e0 (diff)
REmove stupid apple check on OMP in weightvg modifier.
This is handled in build files...
-rw-r--r--source/blender/modifiers/intern/MOD_weightvgproximity.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index 033516016d3..8d71ddfceaf 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -109,12 +109,8 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3],
nearest_v.index = nearest_e.index = nearest_f.index = -1;
/*nearest_v.dist = nearest_e.dist = nearest_f.dist = FLT_MAX;*/
/* Find the nearest vert/edge/face. */
-#ifndef __APPLE__
-#pragma omp parallel for default(none) private(i) firstprivate(nearest_v, nearest_e, nearest_f) \
- shared(treeData_v, treeData_e, treeData_f, numVerts, v_cos, dist_v, dist_e, \
- dist_f, loc2trgt) \
- schedule(static)
-#endif
+#pragma omp parallel for default(shared) private(i) firstprivate(nearest_v, nearest_e, nearest_f) \
+ schedule(static) if (numVerts > 10000)
for (i = 0; i < numVerts; i++) {
float tmp_co[3];