1 files changed, 25 insertions, 15 deletions

diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.cc b/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.cc
index 8e496d1bc15..b47c98fadec 100644
--- a/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.cc
@@ -24,6 +24,9 @@
 #include "node_shader_util.hh"
 
 /* **************** SEPARATE HSV ******************** */
+
+namespace blender::nodes::node_shader_sepcombHSV_cc {
+
 static bNodeSocketTemplate sh_node_sephsv_in[] = {
     {SOCK_RGBA, N_("Color"), 0.8f, 0.8f, 0.8f, 1.0f},
     {-1, ""},
@@ -57,19 +60,8 @@ static int gpu_shader_sephsv(GPUMaterial *mat,
   return GPU_stack_link(mat, node, "separate_hsv", in, out);
 }
 
-void register_node_type_sh_sephsv()
-{
-  static bNodeType ntype;
-
-  sh_node_type_base(&ntype, SH_NODE_SEPHSV, "Separate HSV", NODE_CLASS_CONVERTER, 0);
-  node_type_socket_templates(&ntype, sh_node_sephsv_in, sh_node_sephsv_out);
-  node_type_exec(&ntype, nullptr, nullptr, node_shader_exec_sephsv);
-  node_type_gpu(&ntype, gpu_shader_sephsv);
-
-  nodeRegisterType(&ntype);
-}
-
 /* **************** COMBINE HSV ******************** */
+
 static bNodeSocketTemplate sh_node_combhsv_in[] = {
     {SOCK_FLOAT, N_("H"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
     {SOCK_FLOAT, N_("S"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
@@ -105,14 +97,32 @@ static int gpu_shader_combhsv(GPUMaterial *mat,
   return GPU_stack_link(mat, node, "combine_hsv", in, out);
 }
 
+}  // namespace blender::nodes::node_shader_sepcombHSV_cc
+
+void register_node_type_sh_sephsv()
+{
+  namespace file_ns = blender::nodes::node_shader_sepcombHSV_cc;
+
+  static bNodeType ntype;
+
+  sh_node_type_base(&ntype, SH_NODE_SEPHSV, "Separate HSV", NODE_CLASS_CONVERTER, 0);
+  node_type_socket_templates(&ntype, file_ns::sh_node_sephsv_in, file_ns::sh_node_sephsv_out);
+  node_type_exec(&ntype, nullptr, nullptr, file_ns::node_shader_exec_sephsv);
+  node_type_gpu(&ntype, file_ns::gpu_shader_sephsv);
+
+  nodeRegisterType(&ntype);
+}
+
 void register_node_type_sh_combhsv()
 {
+  namespace file_ns = blender::nodes::node_shader_sepcombHSV_cc;
+
   static bNodeType ntype;
 
   sh_node_type_base(&ntype, SH_NODE_COMBHSV, "Combine HSV", NODE_CLASS_CONVERTER, 0);
-  node_type_socket_templates(&ntype, sh_node_combhsv_in, sh_node_combhsv_out);
-  node_type_exec(&ntype, nullptr, nullptr, node_shader_exec_combhsv);
-  node_type_gpu(&ntype, gpu_shader_combhsv);
+  node_type_socket_templates(&ntype, file_ns::sh_node_combhsv_in, file_ns::sh_node_combhsv_out);
+  node_type_exec(&ntype, nullptr, nullptr, file_ns::node_shader_exec_combhsv);
+  node_type_gpu(&ntype, file_ns::gpu_shader_combhsv);
 
   nodeRegisterType(&ntype);
 }