Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-11-22 17:15:19 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-11-22 17:15:19 +0400
commit47853bf6f6fa7ab4dc523fe255a8253b7ae9f914 (patch)
tree8c968c8577dc88681b121501f87851d9eca35dab /intern/cycles/kernel/kernel_shader.h
parentc71e31eb4f814c1ef561ac5467af3c16efa02a0d (diff)
Cycles: OpenCL tweaks
* Reduce kernel arguments size, helps compile for apple nvidia. * Fix use of unitialized variable in displace kernel. * Use build flags in opencl kernel md5 hash. * Reorganize code for kernel feature #defines a bit.
Diffstat (limited to 'intern/cycles/kernel/kernel_shader.h')
-rw-r--r--intern/cycles/kernel/kernel_shader.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index 1647504207a..570e0721268 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -226,7 +226,7 @@ __device void shader_setup_from_displace(KernelGlobals *kg, ShaderData *sd,
Ng = triangle_normal_MT(kg, prim, &shader);
/* force smooth shading for displacement */
- sd->shader |= SHADER_SMOOTH_NORMAL;
+ shader |= SHADER_SMOOTH_NORMAL;
/* watch out: no instance transform currently */