Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles:

Browse Source 
* Remove an unneeded return in shader_bsdf_eval(), function is void. 
* if / else if tweak in shader_bsdf_ao().
This commit is contained in:
Thomas Dinges
2013-08-14 19:38:14 +00:00
parent 7a6f3d9e43
commit 2c2206a272
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/kernel_shader.h
View File

@@ -498,7 +498,7 @@ __device void shader_bsdf_eval(KernelGlobals *kg, const ShaderData *sd,
#ifdef __MULTI_CLOSURE__ #ifdef __MULTI_CLOSURE__
bsdf_eval_init(eval, NBUILTIN_CLOSURES, make_float3(0.0f, 0.0f, 0.0f), kernel_data.film.use_light_pass); 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 #else
const ShaderClosure *sc = &sd->closure; 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; eval += sc->weight*ao_factor;
*N += sc->N*average(sc->weight); *N += sc->N*average(sc->weight);
} }
if(CLOSURE_IS_AMBIENT_OCCLUSION(sc->type)) { else if(CLOSURE_IS_AMBIENT_OCCLUSION(sc->type)) {
eval += sc->weight; eval += sc->weight;
*N += sd->N*average(sc->weight); *N += sd->N*average(sc->weight);
} }