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
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-10-08 10:09:28 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-10-08 10:41:05 +0300
commitac098007fb25b056f81336dfeef289d14a41dd43 (patch)
treeffc10b4bd0665e0578d2c717d8a5be8cce94c468 /intern
parent1d9de55949a4b1a79370c23e11ad59bffc5ae440 (diff)
Cycles: Fix for point density always using render settings for modifiers
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_session.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 04d05ee7b3c..088748cc0ae 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -1194,7 +1194,8 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name, void
if(b_node.is_a(&RNA_ShaderNodeTexPointDensity)) {
BL::ShaderNodeTexPointDensity b_point_density_node(b_node);
int length;
- b_point_density_node.calc_point_density(b_scene, &length, &pixels);
+ int settings = background ? 1 : 0; /* 1 - render settings, 0 - vewport settings. */
+ b_point_density_node.calc_point_density(b_scene, settings, &length, &pixels);
}
}