[Bf-blender-cvs] [26c7be71d74] master: Nodes: Migrate bump shader node to cpp

Aaron Carlisle noreply at git.blender.org
Fri Dec 24 21:43:33 CET 2021


Commit: 26c7be71d746247e56327f7abb4ff59bf40f6cc8
Author: Aaron Carlisle
Date:   Fri Dec 24 15:42:58 2021 -0500
Branches: master
https://developer.blender.org/rB26c7be71d746247e56327f7abb4ff59bf40f6cc8

Nodes: Migrate bump shader node to cpp

Needed for D13496

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

M	source/blender/nodes/shader/CMakeLists.txt
R096	source/blender/nodes/shader/nodes/node_shader_bump.c	source/blender/nodes/shader/nodes/node_shader_bump.cc

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

diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt
index 7d99c233197..311b7f75d00 100644
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -58,7 +58,7 @@ set(SRC
   nodes/node_shader_bsdf_translucent.c
   nodes/node_shader_bsdf_transparent.c
   nodes/node_shader_bsdf_velvet.c
-  nodes/node_shader_bump.c
+  nodes/node_shader_bump.cc
   nodes/node_shader_camera.c
   nodes/node_shader_clamp.cc
   nodes/node_shader_common.c
diff --git a/source/blender/nodes/shader/nodes/node_shader_bump.c b/source/blender/nodes/shader/nodes/node_shader_bump.cc
similarity index 96%
rename from source/blender/nodes/shader/nodes/node_shader_bump.c
rename to source/blender/nodes/shader/nodes/node_shader_bump.cc
index 7444ea3952a..3d90927116f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bump.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bump.cc
@@ -55,13 +55,13 @@ static int gpu_shader_bump(GPUMaterial *mat,
 }
 
 /* node type definition */
-void register_node_type_sh_bump(void)
+void register_node_type_sh_bump()
 {
   static bNodeType ntype;
 
   sh_node_type_base(&ntype, SH_NODE_BUMP, "Bump", NODE_CLASS_OP_VECTOR, 0);
   node_type_socket_templates(&ntype, sh_node_bump_in, sh_node_bump_out);
-  node_type_storage(&ntype, "", NULL, NULL);
+  node_type_storage(&ntype, "", nullptr, nullptr);
   node_type_gpu(&ntype, gpu_shader_bump);
 
   nodeRegisterType(&ntype);



More information about the Bf-blender-cvs mailing list