[Bf-blender-cvs] [bbcbd2e] master: REmove stupid apple check on OMP in weightvg modifier.
Bastien Montagne
noreply at git.blender.org
Fri Jul 10 15:26:38 CEST 2015
Commit: bbcbd2eed9081e0c1127d32e41592a8dc6b5604b
Author: Bastien Montagne
Date: Fri Jul 10 09:55:01 2015 +0200
Branches: master
https://developer.blender.org/rBbbcbd2eed9081e0c1127d32e41592a8dc6b5604b
REmove stupid apple check on OMP in weightvg modifier.
This is handled in build files...
===================================================================
M source/blender/modifiers/intern/MOD_weightvgproximity.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index 0335160..8d71ddf 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];
More information about the Bf-blender-cvs
mailing list