diff options
| author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
|---|---|---|
| committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
| commit | dbc41b30f88b96f7d8c6e995b17f5930eb55cc77 (patch) | |
| tree | c6c495328443ea3621e5df2ef483b0e0dd504496 /source/blender/nodes/shader/nodes/node_shader_tex_magic.cc | |
| parent | 99a2af76d10e05a18987be5d554ada197b1ca086 (diff) | |
| parent | 7c9e4099854a4fc8eab4db97173c1aacd25f9e08 (diff) | |
Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_tex_magic.cc')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_magic.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc index 62e68d53d03..9bd5c335cee 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc @@ -181,7 +181,7 @@ static void sh_node_magic_tex_build_multi_function( } // namespace blender::nodes -void register_node_type_sh_tex_magic(void) +void register_node_type_sh_tex_magic() { static bNodeType ntype; |