diff options
| author | Patrick Mours <pmours@nvidia.com> | 2022-04-05 18:30:01 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2022-04-05 19:09:21 +0300 |
| commit | e51368728815e3700414a77bf91668425a9965ec (patch) | |
| tree | 9285472413877aca15df761e111dfb03ceaeb402 /intern/cycles/kernel | |
| parent | f60cffad38d12bdfefe503924e93c33a7c89f671 (diff) | |
Cycles: Fix a few type casting warnings
Stumbled over the `integrate_surface_volume_only_bounce` kernel
function not returning the right type. The others too showed up as
warnings when building Cycles as a standalone which didn't have
those warnings disabled.
Differential Revision: https://developer.blender.org/D14558
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/integrator/shade_surface.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/integrator/shade_surface.h b/intern/cycles/kernel/integrator/shade_surface.h index a9bf3b5b432..55bb08044ae 100644 --- a/intern/cycles/kernel/integrator/shade_surface.h +++ b/intern/cycles/kernel/integrator/shade_surface.h @@ -346,8 +346,8 @@ ccl_device_forceinline int integrate_surface_bsdf_bssrdf_bounce( } #ifdef __VOLUME__ -ccl_device_forceinline bool integrate_surface_volume_only_bounce(IntegratorState state, - ccl_private ShaderData *sd) +ccl_device_forceinline int integrate_surface_volume_only_bounce(IntegratorState state, + ccl_private ShaderData *sd) { if (!path_state_volume_next(state)) { return LABEL_NONE; |