Commit: 1f19a093aae8a4fb75f6509cc78b741a186f37d0
Author: Thomas Dinges
Date:   Sun Aug 31 14:00:51 2014 +0200
Branches: master
https://developer.blender.org/rB1f19a093aae8a4fb75f6509cc78b741a186f37d0

Cycles: Always assign the proper value for volume bounces.

I don't see a reason not to do this, and this also fixes update problems when 
3D View rendering is running (no volume shader), and then a volume shader gets 
added.

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

M       intern/cycles/render/integrator.cpp

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

diff --git a/intern/cycles/render/integrator.cpp 
b/intern/cycles/render/integrator.cpp
index 4a8b490..32e887d 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -86,11 +86,7 @@ void Integrator::device_update(Device *device, DeviceScene 
*dscene, Scene *scene
        kintegrator->max_diffuse_bounce = max_diffuse_bounce + 1;
        kintegrator->max_glossy_bounce = max_glossy_bounce + 1;
        kintegrator->max_transmission_bounce = max_transmission_bounce + 1;
-
-       if(kintegrator->use_volumes)
-               kintegrator->max_volume_bounce = max_volume_bounce + 1;
-       else
-               kintegrator->max_volume_bounce = 1;
+       kintegrator->max_volume_bounce = max_volume_bounce + 1;
 
        kintegrator->transparent_max_bounce = transparent_max_bounce + 1;
        kintegrator->transparent_min_bounce = transparent_min_bounce + 1;

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to