GOOENGINE: Shader C++ Fixes

source/blender/nodes/shader/nodes/node_shader_curvature.cc

@@ -58,11 +58,11 @@ void register_node_type_sh_curvature(void)
 {
  namespace file_ns = blender::nodes::node_shader_curvature_cc;
 
- static bNodeType ntype;
+ static blender::bke::bNodeType ntype;
 
  sh_node_type_base(&ntype, SH_NODE_CURVATURE, "Curvature", NODE_CLASS_INPUT);
  ntype.declare = file_ns::node_declare;
  ntype.gpu_fn = node_shader_gpu_curvature;
 
- nodeRegisterType(&ntype);
+ blender::bke::nodeRegisterType(&ntype);
 }

source/blender/nodes/shader/nodes/node_shader_screenspace_info.cc

@@ -35,11 +35,11 @@ static int node_shader_gpu_screenspace_info(GPUMaterial *mat,
 void register_node_type_sh_screenspace_info(void)
 {
  namespace file_ns = blender::nodes::node_shader_screenspace_info_cc;
- static bNodeType ntype;
+ static blender::bke::bNodeType ntype;
 
  sh_node_type_base(&ntype, SH_NODE_SCREENSPACE_INFO, "Screenspace Info", NODE_CLASS_INPUT);
  ntype.declare = file_ns::node_declare;
  ntype.gpu_fn = node_shader_gpu_screenspace_info;
 
- nodeRegisterType(&ntype);
+ blender::bke::nodeRegisterType(&ntype);
 }

source/blender/nodes/shader/nodes/node_shader_sdf_noise.cc

@@ -64,11 +64,11 @@ void register_node_type_sh_sdf_noise(void)
 {
  namespace file_ns = blender::nodes::node_shader_sdf_noise_cc;
 
- static bNodeType ntype;
+ static blender::bke::bNodeType ntype;
 
  sh_node_type_base(&ntype, SH_NODE_SDF_NOISE, "SDF Noise", NODE_CLASS_TEXTURE);
  ntype.declare = file_ns::node_declare;
  ntype.gpu_fn = node_shader_gpu_sdf_noise;
 
- nodeRegisterType(&ntype);
+ blender::bke::nodeRegisterType(&ntype);
 }

source/blender/nodes/shader/nodes/node_shader_sdf_op.cc

@@ -286,15 +286,15 @@ static void node_shader_buts_sdf_op(uiLayout *layout, bContext * /* C */, Pointe
 /* node type definition */
 void register_node_type_sh_sdf_op(void)
 {
-  static bNodeType ntype;
+  static blender::bke::bNodeType ntype;
 
   sh_node_type_base(&ntype, SH_NODE_SDF_OP, "Sdf Operator", NODE_CLASS_CONVERTER);
   ntype.declare = blender::nodes::sh_node_sdf_op_declare;
-  node_type_storage(&ntype, "NodeSdfOp", node_free_standard_storage, node_copy_standard_storage);
+  blender::bke::node_type_storage(&ntype, "NodeSdfOp", node_free_standard_storage, node_copy_standard_storage);
   ntype.gpu_fn = node_shader_gpu_sdf_op;
   ntype.initfunc = node_shader_init_sdf_op;
   ntype.labelfunc = node_shader_label_sdf_op;
   ntype.updatefunc = node_shader_update_sdf_op;
   ntype.draw_buttons = node_shader_buts_sdf_op;
-  nodeRegisterType(&ntype);
+  blender::bke::nodeRegisterType(&ntype);
 }

source/blender/nodes/shader/nodes/node_shader_sdf_primitive.cc

@@ -26,8 +26,11 @@
 #include "UI_interface.hh"
 #include "UI_resources.hh"
 #include "BKE_texture.h"
+#include "RNA_access.hh"
+#include "BLI_string.h"
 
 #include "../node_shader_util.hh"
+#include "node_util.hh"
 
 using namespace blender::bke;
 
@@ -465,11 +468,11 @@ static void node_shader_update_sdf_primitive(bNodeTree *ntree, bNode *node)
 /* node type definition */
 void register_node_type_sh_sdf_primitive(void)
 {
-  static bNodeType ntype;
+  static blender::bke::bNodeType ntype;
 
   sh_node_type_base(&ntype, SH_NODE_SDF_PRIMITIVE, "Sdf Primitive", NODE_CLASS_TEXTURE);
   ntype.declare = blender::nodes::sh_node_sdf_primitive_declare;
-  node_type_storage(
+  blender::bke::node_type_storage(
       &ntype, "NodeSdfPrimitive", node_free_standard_storage, node_copy_standard_storage);
   ntype.gpu_fn = node_shader_gpu_sdf_primitive;
   ntype.initfunc = node_shader_init_sdf_primitive;
@@ -477,5 +480,5 @@ void register_node_type_sh_sdf_primitive(void)
   ntype.updatefunc = node_shader_update_sdf_primitive;
   ntype.draw_buttons = node_shader_buts_sdf_primitive;
 
-  nodeRegisterType(&ntype);
+  blender::bke::nodeRegisterType(&ntype);
 }

source/blender/nodes/shader/nodes/node_shader_sdf_vector_op.cc

@@ -25,8 +25,11 @@
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
+#include "RNA_access.hh"
+#include "BLI_string.h"
 
 #include "../node_shader_util.hh"
+#include "node_util.hh"
 
 using namespace blender::bke;
 
@@ -345,15 +348,15 @@ static void node_shader_buts_sdf_vector_op(uiLayout *layout, bContext* /* C */,
 /* node type definition */
 void register_node_type_sh_sdf_vector_op(void)
 {
-  static bNodeType ntype;
+  static blender::bke::bNodeType ntype;
   sh_node_type_base(&ntype, SH_NODE_SDF_VECTOR_OP, "Sdf Vector Operator", NODE_CLASS_OP_VECTOR);
   ntype.declare = blender::nodes::sh_node_sdf_vector_op_declare;
-  node_type_storage(
+  blender::bke::node_type_storage(
       &ntype, "NodeSdfVectorOp", node_free_standard_storage, node_copy_standard_storage);
   ntype.gpu_fn = node_shader_gpu_sdf_vector_op;
   ntype.initfunc = node_shader_init_sdf_vector_op;
   ntype.labelfunc = node_shader_label_sdf_vector_op;
   ntype.updatefunc = node_shader_update_sdf_vector_op;
   ntype.draw_buttons = node_shader_buts_sdf_vector_op;
-  nodeRegisterType(&ntype);
+  blender::bke::nodeRegisterType(&ntype);
 }

source/blender/nodes/shader/nodes/node_shader_shader_info.cc

@@ -2,9 +2,11 @@
 * Copyright 2005 Blender Foundation. All rights reserved. */
 
 #include "../node_shader_util.hh"
+#include "node_util.hh"
 
 #include "UI_interface.hh"
 #include "UI_resources.hh"
+
 namespace blender::nodes::node_shader_shader_info_cc {
 
 static void node_declare(NodeDeclarationBuilder &b)
@@ -84,7 +86,7 @@ void register_node_type_sh_shader_info(void)
 {
  namespace file_ns = blender::nodes::node_shader_shader_info_cc;
 
- static bNodeType ntype;
+ static blender::bke::bNodeType ntype;
 
  sh_node_type_base(&ntype, SH_NODE_SHADER_INFO, "Shader Info", NODE_CLASS_INPUT);
 
@@ -92,10 +94,10 @@ void register_node_type_sh_shader_info(void)
  ntype.draw_buttons = file_ns::node_shader_buts_shader_info;
  ntype.initfunc = file_ns::node_shader_init_shader_info;
 
- node_type_storage(
+ blender::bke::node_type_storage(
      &ntype, "NodeShaderInfo", node_free_standard_storage, node_copy_standard_storage);
 
  ntype.gpu_fn = file_ns::node_shader_gpu_shader_info;
 
- nodeRegisterType(&ntype);
+ blender::bke::nodeRegisterType(&ntype);
 }