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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-03-19 22:20:01 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-03-19 23:22:15 +0300
commit148b0fef0980ab1263823ef4220d25caa0918d82 (patch)
tree6a2f99a765bde38759a8452443d97dc918564429 /intern/cycles/render
parentfddb4dee8a880df138a5163825625a19d0ec2f1c (diff)
Fix T54317: overlapping volume render bug after recent changes.
Increasing the samplig dimensions like this is not optimal, I'm looking into some deeper changes to reuse the random number and change the RR probabilities, but this should fix the bug for now.
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/integrator.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index c337c19ced1..9c276bcab31 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -187,7 +187,9 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene
max_samples = max(max_samples, volume_samples);
}
- uint total_bounces = max_bounce + transparent_max_bounce + 3 +
+ uint total_bounces = max_bounce +
+ transparent_max_bounce + 3 +
+ VOLUME_BOUNDS_MAX +
max(BSSRDF_MAX_HITS, BSSRDF_MAX_BOUNCES);
max_samples *= total_bounces;