diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-28 18:34:43 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-28 18:34:43 +0300 |
| commit | e183372f901d57795ce22d6c81cc231ec6739ec2 (patch) | |
| tree | b0bfcebef2ba7288b7c3ea425550e7dea26c58c8 /source/blender/blenkernel/intern/collision.c | |
| parent | 08e7b5d348cf2d2e82a6431aa8641fed7b479166 (diff) | |
| parent | 0c7fbc435f4611d6f25a58b17f7f65318bef572d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index a004d32847a..d21b527bbd6 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -802,8 +802,8 @@ int cloth_bvh_objcollision(Object *ob, ClothModifierData *clmd, float step, floa if ( cloth->bvhselftree ) { // search for overlapping collision pairs overlap = BLI_bvhtree_overlap(cloth->bvhselftree, cloth->bvhselftree, &result, NULL, NULL); - - // #pragma omp parallel for private(k, i, j) schedule(static) + + /* Could be parallelized (using BLI_task)... */ for ( k = 0; k < result; k++ ) { float temp[3]; float length = 0; |