diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-18 02:05:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-18 02:14:47 +0400 |
| commit | 7da21752716a0e9e6e6ad8ccbda20fb1c5e8e123 (patch) | |
| tree | d72216f3cdf2e5887282fbce2e0eec28d025392d /source/blender/blenkernel/intern/smoke.c | |
| parent | a861e5572a70111bbe3ae84d82595eddc43b7d88 (diff) | |
KDTree: deprecate 'normal' argument
Normals for each kdtree node were allocated but never used,
and search args only use in particles/boids code.
Diffstat (limited to 'source/blender/blenkernel/intern/smoke.c')
| -rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 0ec277aeed6..d8c27d4468c 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1297,7 +1297,7 @@ static void emit_from_particles(Object *flow_ob, SmokeDomainSettings *sds, Smoke mul_mat3_m4_v3(sds->imat, &particle_vel[valid_particles * 3]); if (sfs->flags & MOD_SMOKE_FLOW_USE_PART_SIZE) { - BLI_kdtree_insert(tree, valid_particles, pos, NULL); + BLI_kdtree_insert(tree, valid_particles, pos); } /* calculate emission map bounds */ @@ -1379,7 +1379,7 @@ static void emit_from_particles(Object *flow_ob, SmokeDomainSettings *sds, Smoke /* find particle distance from the kdtree */ KDTreeNearest nearest; float range = solid + smooth; - BLI_kdtree_find_nearest(tree, ray_start, NULL, &nearest); + BLI_kdtree_find_nearest(tree, ray_start, &nearest); if (nearest.dist < range) { em->influence[index] = (nearest.dist < solid) ? 1.0f : (1.0f - (nearest.dist-solid) / smooth); @@ -1404,7 +1404,7 @@ static void emit_from_particles(Object *flow_ob, SmokeDomainSettings *sds, Smoke /* find particle distance from the kdtree */ KDTreeNearest nearest; float range = solid + hr_smooth; - BLI_kdtree_find_nearest(tree, ray_start, NULL, &nearest); + BLI_kdtree_find_nearest(tree, ray_start, &nearest); if (nearest.dist < range) { em->influence_high[index] = (nearest.dist < solid) ? 1.0f : (1.0f - (nearest.dist-solid) / smooth); |