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>2017-11-08 02:20:59 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-11-08 02:20:59 +0300
commit7b1d7074817dac9d0f088e8e7e5b336bae662c36 (patch)
tree4ebd67459d2fc160d3a6c76a2509cefc68f4e89c /source/blender/nodes/NOD_static_types.h
parent1b18e158025a488e1ba2446ad93c2eb563c11611 (diff)
parenta0478ebe379c8384376586e2880ebc813a6afef7 (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.h1
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 783e1a388c1..a18ee154af8 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -127,6 +127,7 @@ DefNode( ShaderNode, SH_NODE_UVMAP, def_sh_uvmap, "UV
DefNode( ShaderNode, SH_NODE_UVALONGSTROKE, def_sh_uvalongstroke, "UVALONGSTROKE", UVAlongStroke, "UV Along Stroke", "" )
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( CompositorNode, CMP_NODE_VIEWER, def_cmp_viewer, "VIEWER", Viewer, "Viewer", "" )
DefNode( CompositorNode, CMP_NODE_RGB, 0, "RGB", RGB, "RGB", "" )