[Bf-blender-cvs] [3a58de3] master: Blender Internal: Fix regression in point density texture

[Sergey Sharybin]

Commit: 3a58de3bf1413303dcc099db1a2d0ec8be078428
Author: Sergey Sharybin
Date:   Mon Sep 28 21:10:17 2015 +0500
Branches: master
https://developer.blender.org/rB3a58de3bf1413303dcc099db1a2d0ec8be078428

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.

===================================================================

M	source/blender/render/intern/source/pointdensity.c

===================================================================

diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 48f577e..081904e 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;