diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-29 17:59:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-29 19:07:08 +0300 |
| commit | 282b3d0fcd0ab32d6f8ae1694bc50599788eb256 (patch) | |
| tree | 2db9344928f9524d5bf6d33825025c2a95dee081 | |
| parent | cebc7bb1980dcc0864685036188aad4cd79f64c6 (diff) | |
Revert "Fix T53914: Volumetric scattering now goes correctly through transparent surfaces."
This reverts commit 3c852ba0741f794a697f95073b04921e9ff94039. This is breaking
the regression tests, and maybe requires some deeper changes to really fix.
| -rw-r--r-- | intern/cycles/kernel/kernel_path_state.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_path_state.h b/intern/cycles/kernel/kernel_path_state.h index e5e915791cb..2ae866bb051 100644 --- a/intern/cycles/kernel/kernel_path_state.h +++ b/intern/cycles/kernel/kernel_path_state.h @@ -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; |