diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-18 15:13:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-18 15:13:16 +0300 |
| commit | 3d67819a1709e35b2fb42a9d554b30136a72eec9 (patch) | |
| tree | da74b41c52fab9592ee12e3db0c046bf70d85d5a /source/blender/blenkernel/intern/node.c | |
| parent | 257d072317f21861cdb7c168a60497bcb74d73d4 (diff) | |
| parent | 5078b9d2d08a34ae3786100c2301ea960165e7f2 (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 7aa0ecdad87..c81f5f425d8 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -3432,6 +3432,7 @@ static void registerCompositNodes(void) register_node_type_cmp_doubleedgemask(); register_node_type_cmp_keyingscreen(); register_node_type_cmp_keying(); + register_node_type_cmp_cryptomatte(); register_node_type_cmp_translate(); register_node_type_cmp_rotate(); @@ -3520,6 +3521,7 @@ static void registerShaderNodes(void) register_node_type_sh_bsdf_velvet(); register_node_type_sh_bsdf_toon(); register_node_type_sh_bsdf_hair(); + register_node_type_sh_bsdf_hair_principled(); register_node_type_sh_emission(); register_node_type_sh_holdout(); register_node_type_sh_volume_absorption(); |