diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-08-21 01:27:59 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-08-21 01:27:59 +0400 |
| commit | ccf7b391cd638af8775c5b632df2f804e9de5a52 (patch) | |
| tree | f5849736cd84eb99bde99b913f78159136712404 /intern/cycles/kernel/svm | |
| parent | 161815576fc497576055f1013f73678bf8d72ef4 (diff) | |
Further cleanup for defines:
* Merge Texture defines
* Remove Normal Map define.
Diffstat (limited to 'intern/cycles/kernel/svm')
| -rw-r--r-- | intern/cycles/kernel/svm/svm.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 738a62a4dca..c13eae813d6 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -236,7 +236,7 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, Shade if(stack_load_float(stack, node.z) == 1.0f) offset += node.y; break; -#ifdef __IMAGE_TEXTURES__ +#ifdef __TEXTURES__ case NODE_TEX_IMAGE: svm_node_tex_image(kg, sd, stack, node); break; @@ -246,8 +246,6 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, Shade case NODE_TEX_ENVIRONMENT: svm_node_tex_environment(kg, sd, stack, node); break; -#endif -#ifdef __PROCEDURAL_TEXTURES__ case NODE_TEX_SKY: svm_node_tex_sky(kg, sd, stack, node, &offset); break; @@ -423,12 +421,10 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, Shade #endif case NODE_TANGENT: svm_node_tangent(kg, sd, stack, node); - break; -#ifdef __NORMAL_MAP__ + break; case NODE_NORMAL_MAP: svm_node_normal_map(kg, sd, stack, node); - break; -#endif + break; case NODE_END: default: return; |