diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-16 16:50:13 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-16 16:50:13 +0400 |
| commit | 0786eebd1194b108d71299137c715b10e100d8f5 (patch) | |
| tree | 4b89a5aed5b44881a9e52c3cd982f457532d76fa /intern/cycles | |
| parent | 9591957c8aa92740985f323673ccf0b6be318d62 (diff) | |
| parent | d75e14b31e5e65d1e38b1ca4688a42a346ac9495 (diff) | |
Merged revision(s) 59108-59184 from trunk/blender into soc-2013-dingto.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_closures.h | 7 |
2 files changed, 5 insertions, 6 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); } diff --git a/intern/cycles/kernel/osl/osl_closures.h b/intern/cycles/kernel/osl/osl_closures.h index 17d7260c191..ca5f441aa2d 100644 --- a/intern/cycles/kernel/osl/osl_closures.h +++ b/intern/cycles/kernel/osl/osl_closures.h @@ -33,14 +33,13 @@ #ifndef __OSL_CLOSURES_H__ #define __OSL_CLOSURES_H__ +#include "util_types.h" +#include "kernel_types.h" + #include <OSL/oslclosure.h> #include <OSL/oslexec.h> #include <OSL/genclosure.h> -#include "kernel_types.h" - -#include "util_types.h" - CCL_NAMESPACE_BEGIN OSL::ClosureParam *closure_emission_params(); |