Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Fix T53914: Volumetric scattering now goes correctly through transparent surfaces."

Browse Source 
This reverts commit 3c852ba074. This is breaking
the regression tests, and maybe requires some deeper changes to really fix.
This commit is contained in:
Brecht Van Lommel
2018-01-29 15:59:46 +01:00
parent cebc7bb198
commit 282b3d0fcd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/kernel_path_state.h
View File

@@ -179,13 +179,13 @@ ccl_device_inline float path_state_continuation_probability(KernelGlobals *kg,
#endif
}
else {
/* Test max bounces for various ray types.
The check for max_volume_bounce doesn't happen here but inside volume_shader_sample().
See T53914.
*/
/* Test max bounces for various ray types. */
if((state->bounce >= kernel_data.integrator.max_bounce) ||
(state->diffuse_bounce >= kernel_data.integrator.max_diffuse_bounce) ||
(state->glossy_bounce >= kernel_data.integrator.max_glossy_bounce) ||
#ifdef __VOLUME__
(state->volume_bounce >= kernel_data.integrator.max_volume_bounce) ||
#endif
(state->transmission_bounce >= kernel_data.integrator.max_transmission_bounce))
{
return 0.0f;