From aae2cea28d0c6c970778674e0ba329b2208b8366 Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Wed, 14 Sep 2016 18:53:35 +0200 Subject: Cycles: Also support the constant emission speedup for mesh lights Reviewers: brecht, sergey, dingto, juicyfruit Differential Revision: https://developer.blender.org/D2220 --- intern/cycles/kernel/geom/geom_object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/kernel/geom') diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h index 4f72c5b7b93..c2ec774362a 100644 --- a/intern/cycles/kernel/geom/geom_object.h +++ b/intern/cycles/kernel/geom/geom_object.h @@ -308,7 +308,7 @@ ccl_device_inline uint object_patch_map_offset(KernelGlobals *kg, int object) ccl_device int shader_pass_id(KernelGlobals *kg, const ShaderData *sd) { - return kernel_tex_fetch(__shader_flag, (ccl_fetch(sd, shader) & SHADER_MASK)*2 + 1); + return kernel_tex_fetch(__shader_flag, (ccl_fetch(sd, shader) & SHADER_MASK)*SHADER_SIZE + 1); } /* Particle data from which object was instanced */ -- cgit v1.2.3