From a9e0caa92d68bbfd1ef332b47e321fafda3e9975 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 3 Jan 2022 21:52:20 -0500 Subject: [PATCH] Cleanup: Move node storage macro inside file namespace Must have been a mistake in previous commits, this fix is needed to enable unity builds. --- source/blender/nodes/shader/nodes/node_shader_map_range.cc | 4 ++-- source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc | 4 ++-- source/blender/nodes/shader/nodes/node_shader_tex_noise.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/blender/nodes/shader/nodes/node_shader_map_range.cc b/source/blender/nodes/shader/nodes/node_shader_map_range.cc index adc931d1bd0..6373462a288 100644 --- a/source/blender/nodes/shader/nodes/node_shader_map_range.cc +++ b/source/blender/nodes/shader/nodes/node_shader_map_range.cc @@ -29,10 +29,10 @@ #include "NOD_socket_search_link.hh" -NODE_STORAGE_FUNCS(NodeMapRange) - namespace blender::nodes::node_shader_map_range_cc { +NODE_STORAGE_FUNCS(NodeMapRange) + static void sh_node_map_range_declare(NodeDeclarationBuilder &b) { b.is_function_node(); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc index c1a9ddbd5d7..8f0f251e97a 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc @@ -21,10 +21,10 @@ #include "BLI_noise.hh" -NODE_STORAGE_FUNCS(NodeTexMusgrave) - namespace blender::nodes::node_shader_tex_musgrave_cc { +NODE_STORAGE_FUNCS(NodeTexMusgrave) + static void sh_node_tex_musgrave_declare(NodeDeclarationBuilder &b) { b.is_function_node(); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc index 30ad03707f9..8b4334467b0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc @@ -21,10 +21,10 @@ #include "BLI_noise.hh" -NODE_STORAGE_FUNCS(NodeTexNoise) - namespace blender::nodes::node_shader_tex_noise_cc { +NODE_STORAGE_FUNCS(NodeTexNoise) + static void sh_node_tex_noise_declare(NodeDeclarationBuilder &b) { b.is_function_node();