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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-09-28 19:10:17 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-09-30 18:08:26 +0300
commit24615ecab510c5d25a7b69a5259770eaddfed7ef (patch)
treed6cac77d15adde185297899c22a707309ac8caa6
parent6cb20d628776f77ea81732d34cc816549abc7167 (diff)
Blender Internal: Fix regression in point density texture
The issue was introduced by original Cycles point density support commit, it lead to a constant density of 1 for object verticies point density source.
-rw-r--r--source/blender/render/intern/source/pointdensity.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 48f577e71bb..081904e4a65 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -597,6 +597,9 @@ int pointdensitytex(Tex *tex, const float texvec[3], TexResult *texres)
BRICONT;
+ if (pd->color_source == TEX_PD_COLOR_CONSTANT)
+ return retval;
+
retval |= pointdensity_color(pd, texres, age, vec);
BRICONTRGB;