diff options
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/integrator/shade_surface.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/types.h | 2 |
2 files changed, 3 insertions, 3 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; diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h index 9d9daaa0dda..db499a1e1bc 100644 --- a/intern/cycles/kernel/types.h +++ b/intern/cycles/kernel/types.h @@ -666,7 +666,7 @@ typedef struct AttributeDescriptor { /* For manifold next event estimation, we need space to store and evaluate * 2 closures (with extra data) on the refractive interfaces, in addition * to keeping the full sd at the current shading point. We need 4 because a - * refractive bsdf is instanced with a companion reflection bsdf, even though + * refractive BSDF is instanced with a companion reflection BSDF, even though * we only need the refractive one, and each of them requires 2 slots. */ #ifndef __CAUSTICS_MAX_CLOSURE__ # define CAUSTICS_MAX_CLOSURE 4 |