diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-23 15:11:02 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-23 15:19:32 +0300 |
commit | 41cc2ae62639bc6c8480beef86269c5b7fbd11fa (patch) | |
tree | 0ae885cebce8fe72caf2c1acdf172f2fd870bce5 /source/blender/blenkernel/intern/node.c | |
parent | 4ebcdff873cb71bb031155a9bddcc92dde8e6370 (diff) | |
parent | 4a3ddd8a7a5bc1851f832869310b5340a6b41d46 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 5d1b4740645..cac2aab26dd 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -3589,6 +3589,7 @@ static void registerShaderNodes(void) register_node_type_sh_attribute(); register_node_type_sh_bevel(); + register_node_type_sh_displacement(); register_node_type_sh_geometry(); register_node_type_sh_light_path(); register_node_type_sh_light_falloff(); |