diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-06-16 16:05:39 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-06-16 16:05:39 +0400 |
| commit | 04295954408db25e749a897a7db2972049005688 (patch) | |
| tree | 1db66e453f0599289762474e591fd2569ae0591f /intern/cycles/kernel/svm/svm.h | |
| parent | 9e16c5a9e429e0d00801a4dd6ee71a8fbf6691f0 (diff) | |
| parent | 29be97975876a1f298f4e6dab14c75aa9956f96a (diff) | |
Merged revision(s) 57423-57498 from trunk/blender into soc-2013-dingto
Diffstat (limited to 'intern/cycles/kernel/svm/svm.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index e08e41e78e5..0a8896f3c44 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -360,10 +360,10 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_LAYER_WEIGHT: svm_node_layer_weight(sd, stack, node); break; +#ifdef __EXTRA_NODES__ case NODE_WIREFRAME: svm_node_wireframe(kg, sd, stack, node.y, node.z, node.w); break; -#ifdef __EXTRA_NODES__ case NODE_WAVELENGTH: svm_node_wavelength(sd, stack, node.y, node.z); break; |