[Bf-blender-cvs] [a9e0caa92d6] master: Cleanup: Move node storage macro inside file namespace

Aaron Carlisle noreply at git.blender.org
Tue Jan 4 04:01:25 CET 2022


Commit: a9e0caa92d68bbfd1ef332b47e321fafda3e9975
Author: Aaron Carlisle
Date:   Mon Jan 3 21:52:20 2022 -0500
Branches: master
https://developer.blender.org/rBa9e0caa92d68bbfd1ef332b47e321fafda3e9975

Cleanup: Move node storage macro inside file namespace

Must have been a mistake in previous commits,
this fix is needed to enable unity builds.

===================================================================

M	source/blender/nodes/shader/nodes/node_shader_map_range.cc
M	source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc
M	source/blender/nodes/shader/nodes/node_shader_tex_noise.cc

===================================================================

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();



More information about the Bf-blender-cvs mailing list