From 2f5e10f7b81ed2e270be8a21ccf356311caabd51 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 14 Aug 2013 06:51:18 +0000 Subject: include order change for osl, fixes gcc compile error - undefined uintptr_t --- intern/cycles/kernel/osl/osl_closures.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'intern/cycles/kernel') 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 #include #include -#include "kernel_types.h" - -#include "util_types.h" - CCL_NAMESPACE_BEGIN OSL::ClosureParam *closure_emission_params(); -- cgit v1.2.3 From 2c2206a27208c3869a51528d24637806075f1804 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 14 Aug 2013 19:38:14 +0000 Subject: Cycles: * Remove an unneeded return in shader_bsdf_eval(), function is void. * if / else if tweak in shader_bsdf_ao(). --- intern/cycles/kernel/kernel_shader.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/kernel') 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); } -- cgit v1.2.3