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/nodes/NOD_static_types.h | |
| parent | 4ebcdff873cb71bb031155a9bddcc92dde8e6370 (diff) | |
| parent | 4a3ddd8a7a5bc1851f832869310b5340a6b41d46 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes/NOD_static_types.h')
| -rw-r--r-- | source/blender/nodes/NOD_static_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index a18ee154af8..e2c1fae1bde 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -128,6 +128,7 @@ DefNode( ShaderNode, SH_NODE_UVALONGSTROKE, def_sh_uvalongstroke, "UV DefNode( ShaderNode, SH_NODE_SEPXYZ, 0, "SEPXYZ", SeparateXYZ, "Separate XYZ", "" ) DefNode( ShaderNode, SH_NODE_COMBXYZ, 0, "COMBXYZ", CombineXYZ, "Combine XYZ", "" ) DefNode( ShaderNode, SH_NODE_BEVEL, def_sh_bevel, "BEVEL", Bevel, "Bevel", "" ) +DefNode( ShaderNode, SH_NODE_DISPLACEMENT, 0, "DISPLACEMENT", Displacement, "Displacement", "" ) DefNode( CompositorNode, CMP_NODE_VIEWER, def_cmp_viewer, "VIEWER", Viewer, "Viewer", "" ) DefNode( CompositorNode, CMP_NODE_RGB, 0, "RGB", RGB, "RGB", "" ) |