diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-14 23:38:14 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-14 23:38:14 +0400 |
| commit | 2c2206a27208c3869a51528d24637806075f1804 (patch) | |
| tree | 7a135fab9e23775c213f3b41681301f87b7a2be5 /intern | |
| parent | 7a6f3d9e43cec6ac2b00b01279820d8b8dce290d (diff) | |
Cycles:
* Remove an unneeded return in shader_bsdf_eval(), function is void.
* if / else if tweak in shader_bsdf_ao().
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index d8ff662c505..5dd12f98b9c 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -498,7 +498,7 @@ __device void shader_bsdf_eval(KernelGlobals *kg, const ShaderData *sd, #ifdef __MULTI_CLOSURE__ bsdf_eval_init(eval, NBUILTIN_CLOSURES, make_float3(0.0f, 0.0f, 0.0f), kernel_data.film.use_light_pass); - return _shader_bsdf_multi_eval(kg, sd, omega_in, pdf, -1, eval, 0.0f, 0.0f); + _shader_bsdf_multi_eval(kg, sd, omega_in, pdf, -1, eval, 0.0f, 0.0f); #else const ShaderClosure *sc = &sd->closure; @@ -720,7 +720,7 @@ __device float3 shader_bsdf_ao(KernelGlobals *kg, ShaderData *sd, float ao_facto eval += sc->weight*ao_factor; *N += sc->N*average(sc->weight); } - if(CLOSURE_IS_AMBIENT_OCCLUSION(sc->type)) { + else if(CLOSURE_IS_AMBIENT_OCCLUSION(sc->type)) { eval += sc->weight; *N += sd->N*average(sc->weight); } |