bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Grr, forgot those ones in previous commit...

Browse Source 
Never believe QTCreator when it comes to finding all usages of a func, kids... grep ftw!
This commit is contained in:
Bastien Montagne 2015-12-30 21:03:39 +01:00
parent 511e3c5d9d
commit 6472810c96
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/smoke.c
View File

@ -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);

10
source/blender/blenlib/intern/math_statistics.c
View File

@ -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);
}
/**