diff options
| author | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
| commit | de6cee4fc1913982b0b2bd786bfd813c935bbe73 (patch) | |
| tree | a726c0c63bbd1d6c47c90c32119ce14c8048cddc /source/blender/nodes/shader/nodes/node_shader_value.cc | |
| parent | e4d432500a0e2f978fe019da43deb843da405032 (diff) | |
| parent | 88bb29dea668df8cc46aa7f55895f229748bdbb4 (diff) | |
Merge branch 'master' into codesign_error_tracker
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_value.cc')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_value.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_value.cc b/source/blender/nodes/shader/nodes/node_shader_value.cc index 1a1382fa8af..5a8a1b847cc 100644 --- a/source/blender/nodes/shader/nodes/node_shader_value.cc +++ b/source/blender/nodes/shader/nodes/node_shader_value.cc @@ -51,7 +51,7 @@ void register_node_type_sh_value(void) static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_VALUE, "Value", NODE_CLASS_INPUT, 0); - node_type_socket_templates(&ntype, NULL, sh_node_value_out); + node_type_socket_templates(&ntype, nullptr, sh_node_value_out); node_type_gpu(&ntype, gpu_shader_value); ntype.expand_in_mf_network = sh_node_value_expand_in_mf_network; |