Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2008-11-19 08:30:52 +0300
committerMatt Ebb <matt@mke3.net>2008-11-19 08:30:52 +0300
commit14a0718a8a4ed3ee95f6374e20dbe9e74cf3b5c6 (patch)
tree5b505f0b0e22a3d7dc6f8c3a6bc4ee900bc1fe86 /source/blender/render/intern/source/pointdensity.c
parente5b51109e955e3dd6ec4857f833c3aa51f0fa3f4 (diff)
* fix - constant colour output in point density wasn't working
Diffstat (limited to 'source/blender/render/intern/source/pointdensity.c')
-rw-r--r--source/blender/render/intern/source/pointdensity.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index af2a7edae06..db675c81840 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -418,14 +418,14 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
co[1] = texvec[1] + noise_fac * turb;
co[2] = texvec[2] + noise_fac * turb;
- /* reset and do a new BVH query with the perturbed coordinates */
+ /* reset and prepare for a new BVH query with the perturbed coordinates */
density = vec[0] = vec[1] = vec[2] = 0.0f;
- num = BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
- if (num > 0) {
- age /= num;
- VecMulf(vec, 1.0f/num);
- }
-
+ }
+
+ num = BLI_bvhtree_range_query(pd->point_tree, co, pd->radius, accum_density, &pdr);
+ if (num > 0) {
+ age /= num;
+ VecMulf(vec, 1.0f/num);
}
texres->tin = density;
@@ -459,6 +459,7 @@ int pointdensitytex(Tex *tex, float *texvec, TexResult *texres)
VECCOPY(&texres->tr, vec);
texres->ta = 1.0f;
break;
+ case TEX_PD_COLOR_CONSTANT:
default:
texres->tr = texres->tg = texres->tb = texres->ta = 1.0f;
break;