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@gmail.com>2018-01-13 15:11:03 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-01-23 13:12:26 +0300
commit4a5ee1a5a2adc8032cf710357081d3a1e3fcad95 (patch)
treee6da17d7fa18f7008ea8bfb0dd3ef9cd475c1a2c /intern/cycles/kernel/svm/svm.h
parent2838cf0dfe6c8b435cc54881bf548e2bbb0096ae (diff)
Cycles: add Displacement node.
This converts object space height to world space displacement, to be linked to the new vector displacement material output. Differential Revision: https://developer.blender.org/D3015
Diffstat (limited to 'intern/cycles/kernel/svm/svm.h')
-rw-r--r--intern/cycles/kernel/svm/svm.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h
index d3dac5706d0..cbc603d4645 100644
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@ -267,6 +267,9 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ccl_a
case NODE_SET_DISPLACEMENT:
svm_node_set_displacement(kg, sd, stack, node.y);
break;
+ case NODE_DISPLACEMENT:
+ svm_node_displacement(kg, sd, stack, node);
+ break;
# endif /* NODES_FEATURE(NODE_FEATURE_BUMP) */
# ifdef __TEXTURES__
case NODE_TEX_IMAGE: