diff options
author | Jacques Lucke <jacques@blender.org> | 2021-12-07 15:26:39 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-12-07 15:26:39 +0300 |
commit | 0f48b37aae0230119523a9718b331961bd989a78 (patch) | |
tree | 3cbbeb57645785ed0be60719dd16392c9cee595a /source/blender/nodes/shader/nodes/node_shader_math.cc | |
parent | ae5a89e80af78b85877a049d392a84553f2791aa (diff) |
Revert moving all shader nodes to c++
This reverts to following commits:
* rB5cad004d716da02f511bd34983ac7da820308676
* rB97e3a2d935ba9b21b127eda7ca104d4bcf4e48bd
* rBf60b95b5320f8d6abe6a629fe8fc4f1b94d0d91c
* rB0bd3cad04edf4bf9b9d3b1353f955534aa5e6740
* rBf72cc47d8edf849af98e196f721022bacf86a5e7
* rB3f7014ecc9d523997062eadd62888af5fc70a2b6
* rB0578921063fbb081239439062215f2538a31af4b
* rBc20098e6ec6adee874a12e510aa4a56d89f92838
* rBd5efda72f501ad95679d7ac554086a1fb18c1ac0
The original move to c++ that the other commits depended upon had some issues
that should be fixed before committing it again. The issues were reported in
T93797, T93809 and T93798.
We should also find a better rule for not using c-style casts going forward,
although that wouldn't have been reason enough to revert the commits.
Introducing something like a `MEM_new<T>` and `MEM_delete<T>`
function might help with the the most common case of casting the return
type of `MEM_malloc`.
Going forward, I recommend first committing the changes that don't
require converting files to c++. Then convert the shading node files
in smaller chunks. Especially don't mix fairly low risk changes like
moving some simple nodes, with higher risk changes.
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_math.cc')
-rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_math.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_math.cc b/source/blender/nodes/shader/nodes/node_shader_math.cc index 5fca37aecb4..1e94148c5c7 100644 --- a/source/blender/nodes/shader/nodes/node_shader_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_math.cc @@ -21,13 +21,13 @@ * \ingroup shdnodes */ -#include "node_shader_util.hh" +#include "node_shader_util.h" #include "NOD_math_functions.hh" /* **************** SCALAR MATH ******************** */ -namespace blender::nodes::node_shader_math_cc { +namespace blender::nodes { static void sh_node_math_declare(NodeDeclarationBuilder &b) { @@ -44,6 +44,8 @@ static void sh_node_math_declare(NodeDeclarationBuilder &b) b.add_output<decl::Float>(N_("Value")); }; +} // namespace blender::nodes + static const char *gpu_shader_get_name(int mode) { const blender::nodes::FloatMathOperationInfo *info = @@ -159,20 +161,16 @@ static void sh_node_math_build_multi_function(blender::nodes::NodeMultiFunctionB } } -} // namespace blender::nodes::node_shader_math_cc - -void register_node_type_sh_math() +void register_node_type_sh_math(void) { - namespace file_ns = blender::nodes::node_shader_math_cc; - static bNodeType ntype; sh_fn_node_type_base(&ntype, SH_NODE_MATH, "Math", NODE_CLASS_CONVERTER, 0); - ntype.declare = file_ns::sh_node_math_declare; + ntype.declare = blender::nodes::sh_node_math_declare; node_type_label(&ntype, node_math_label); - node_type_gpu(&ntype, file_ns::gpu_shader_math); + node_type_gpu(&ntype, gpu_shader_math); node_type_update(&ntype, node_math_update); - ntype.build_multi_function = file_ns::sh_node_math_build_multi_function; + ntype.build_multi_function = sh_node_math_build_multi_function; nodeRegisterType(&ntype); } |