diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-16 21:06:01 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-16 21:06:01 +0400 |
commit | 7600c687b27c07e8cad2ac1fdef912cd4ba47492 (patch) | |
tree | a147d458af6b9f2f0acb7023af4a0b0b38f66994 /intern | |
parent | 7b1ef0f41620514be98fc9fff9db9bd59ae57e0d (diff) |
Cycles: fix sampling issue with certain (transparent) max bounce settings, and
tweak presets/defaults to use 128 instead of 1024.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 8 | ||||
-rw-r--r-- | intern/cycles/render/integrator.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 8d3f709cdef..a47174dd6c6 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -55,16 +55,18 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): default=8, min=0, max=1024) cls.diffuse_bounces = IntProperty(name="Diffuse Bounces", description="Maximum number of diffuse reflection bounces, bounded by total maximum", - default=1024, min=0, max=1024) + default=128, min=0, max=1024) cls.glossy_bounces = IntProperty(name="Glossy Bounces", description="Maximum number of glossy reflection bounces, bounded by total maximum", - default=1024, min=0, max=1024) + default=128, min=0, max=1024) cls.transmission_bounces = IntProperty(name="Transmission Bounces", description="Maximum number of transmission bounces, bounded by total maximum", - default=1024, min=0, max=1024) + default=128, min=0, max=1024) cls.transparent_min_bounces = IntProperty(name="Transparent Min Bounces", description="Minimum number of transparent bounces, setting this lower than the maximum enables probalistic path termination (faster but noisier)", default=8, min=0, max=1024) cls.transparent_max_bounces = IntProperty(name="Transparent Max Bounces", description="Maximum number of transparent bounces", default=8, min=0, max=1024) + cls.use_transparent_shadows = BoolProperty(name="Transparent Shadows", description="Use transparency of surfaces for rendering shadows", + default=True) cls.film_exposure = FloatProperty(name="Exposure", description="Image brightness scale", default=1.0, min=0.0, max=10.0) diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp index 57689be3965..78ea464d836 100644 --- a/intern/cycles/render/integrator.cpp +++ b/intern/cycles/render/integrator.cpp @@ -80,7 +80,7 @@ void Integrator::device_update(Device *device, DeviceScene *dscene) kintegrator->blur_caustics = blur_caustics; /* sobol directions table */ - int dimensions = PRNG_BASE_NUM + (max_bounce + 2)*PRNG_BOUNCE_NUM; + int dimensions = PRNG_BASE_NUM + (max_bounce + transparent_max_bounce + 2)*PRNG_BOUNCE_NUM; uint *directions = dscene->sobol_directions.resize(SOBOL_BITS*dimensions); sobol_generate_direction_vectors((uint(*)[SOBOL_BITS])directions, dimensions); |