Commit: 4625f98fca37dc70c36b0ff36dc19f4a51ecf25c Author: varunsundar08 Date: Mon May 4 20:34:57 2015 +0530 Branches: cycles_kernel_split https://developer.blender.org/rB4625f98fca37dc70c36b0ff36dc19f4a51ecf25c
Remove '#ifndef __SPLIT_KERNEL__' around shader_eval_displacement =================================================================== M intern/cycles/kernel/kernel_shader.h =================================================================== diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 1153870..1b7cc4b 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -1043,11 +1043,10 @@ ccl_device void shader_eval_volume(ccl_addr_space KernelGlobals *kg, ShaderData #endif /* Displacement Evaluation */ -#ifndef __SPLIT_KERNEL__ -ccl_device void shader_eval_displacement(KernelGlobals *kg, ShaderData *sd, ShaderContext ctx) +ccl_device void shader_eval_displacement(ccl_addr_space KernelGlobals *kg, ccl_addr_space ShaderData *sd, ShaderContext ctx) { - sd->num_closure = 0; - sd->randb_closure = 0.0f; + sd_fetch(num_closure) = 0; + sd_fetch(randb_closure) = 0.0f; /* this will modify sd->P */ #ifdef __SVM__ @@ -1061,7 +1060,6 @@ ccl_device void shader_eval_displacement(KernelGlobals *kg, ShaderData *sd, Shad } #endif } -#endif /* Transparent Shadows */ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs