diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-12-30 23:03:39 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-12-30 23:05:57 +0300 |
| commit | 6472810c96357a620076fd8133754d956cc32773 (patch) | |
| tree | fdf7fe13305eb5c77044b44aae1a503ab20eeb23 /source | |
| parent | 511e3c5d9d503b47cd5fb6fe48abeafde9fbff2d (diff) | |
Grr, forgot those ones in previous commit...
Never believe QTCreator when it comes to finding all usages of a func, kids... grep ftw!
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 8 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/math_statistics.c | 10 |
2 files changed, 6 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index ad2736a6a75..29ae04bfd39 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -868,7 +868,7 @@ static void obstacles_from_derivedmesh( .velocityX = velocityX, .velocityY = velocityY, .velocityZ = velocityZ }; BLI_task_parallel_range_ex( - sds->res_min[2], sds->res_max[2], &data, NULL, 0, obstacles_from_derivedmesh_task_cb, 0, false); + sds->res_min[2], sds->res_max[2], &data, NULL, 0, obstacles_from_derivedmesh_task_cb, true, false); } /* free bvh tree */ free_bvhtree_from_mesh(&treeData); @@ -1476,7 +1476,7 @@ static void emit_from_particles( .solid = solid, .smooth = smooth, .hr_smooth = hr_smooth, }; - BLI_task_parallel_range_ex(min[2], max[2], &data, NULL, 0, emit_from_particles_task_cb, 0, false); + BLI_task_parallel_range_ex(min[2], max[2], &data, NULL, 0, emit_from_particles_task_cb, true, false); } if (sfs->flags & MOD_SMOKE_FLOW_USE_PART_SIZE) { @@ -1801,7 +1801,7 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo .flow_center = flow_center, .min = min, .max = max, .res = res, }; - BLI_task_parallel_range_ex(min[2], max[2], &data, NULL, 0, emit_from_derivedmesh_task_cb, 0, false); + BLI_task_parallel_range_ex(min[2], max[2], &data, NULL, 0, emit_from_derivedmesh_task_cb, true, false); } /* free bvh tree */ free_bvhtree_from_mesh(&treeData); @@ -2589,7 +2589,7 @@ static void update_effectors(Scene *scene, Object *ob, SmokeDomainSettings *sds, data.velocity_z = smoke_get_velocity_z(sds->fluid); data.obstacle = smoke_get_obstacle(sds->fluid); - BLI_task_parallel_range_ex(0, sds->res[0], &data, NULL, 0, update_effectors_task_cb, 0, false); + BLI_task_parallel_range_ex(0, sds->res[0], &data, NULL, 0, update_effectors_task_cb, true, false); } pdEndEffectors(&effectors); diff --git a/source/blender/blenlib/intern/math_statistics.c b/source/blender/blenlib/intern/math_statistics.c index 784f6904160..97c224e0878 100644 --- a/source/blender/blenlib/intern/math_statistics.c +++ b/source/blender/blenlib/intern/math_statistics.c @@ -117,14 +117,8 @@ void BLI_covariance_m_vn_ex( .covfac = covfac, .n = n, .nbr_cos_vn = nbr_cos_vn, }; - if ((nbr_cos_vn * n * n) >= 10000) { - BLI_task_parallel_range_ex(0, n * n, &data, NULL, 0, covariance_m_vn_ex_task_cb, 0, false); - } - else { - for (int k = 0; k < n * n; k++) { - covariance_m_vn_ex_task_cb(&data, NULL, k); - } - } + BLI_task_parallel_range_ex( + 0, n * n, &data, NULL, 0, covariance_m_vn_ex_task_cb, (nbr_cos_vn * n * n) >= 10000, false); } /** |