diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-07 18:48:04 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-07 18:48:04 +0400 |
| commit | 7b0a46b1ff4409a599751392329341c161c7e3c0 (patch) | |
| tree | b0c435db7c95235d1adf8ba4eee29faa59f590e6 /intern/cycles/kernel/kernel_path_state.h | |
| parent | 2dd33289876cfaf2d25be58fa2f63541616da339 (diff) | |
Fix CUDA/OpenCL compile errors in scattering commit.
Diffstat (limited to 'intern/cycles/kernel/kernel_path_state.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_path_state.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_path_state.h b/intern/cycles/kernel/kernel_path_state.h index 5def19f2c42..d9af6298813 100644 --- a/intern/cycles/kernel/kernel_path_state.h +++ b/intern/cycles/kernel/kernel_path_state.h @@ -153,8 +153,10 @@ ccl_device_inline float path_state_terminate_probability(KernelGlobals *kg, Path 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) || - (state->transmission_bounce >= kernel_data.integrator.max_transmission_bounce) || - (state->volume_bounce >= kernel_data.integrator.max_volume_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; } |