ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nodes: NoOp defaults for Math node when added through link drag search

Browse source 
When adding a math node through the link drag search menu, the node
defaults are initialized such that the node has no effect.

## Defaults:
### 2nd input defaults to 1:
- Multiply
- Multiply Add
- Power
- Truncated modulo
- Floored modulo
- Modulo
- Artan2
### 2nd input defaults to 0:
- Add
- Subtract
### 3rd input defaults to 0:
- Multiply Add

Pull Request: https://projects.blender.org/blender/blender/pulls/155859
This commit is contained in:
Habib Gahbiche 2026-03-20 11:35:55 +01:00
parent 5e9e651275
commit c01b317f14
1 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

37
source/blender/nodes/shader/nodes/node_shader_math.cc
View file

@ -9,6 +9,8 @@
#include "node_shader_util.hh"
#include "node_util.hh"
#include "BKE_node.hh"
#include "NOD_inverse_eval_params.hh"
#include "NOD_math_functions.hh"
#include "NOD_socket_search_link.hh"
@ -85,6 +87,40 @@ static void sh_node_math_declare(NodeDeclarationBuilder &b)
b.add_output<decl::Float>("Value");
}
static void math_input_defaults(bNode &node, const NodeMathOperation mode)
{
bNodeSocket *socket_2 = bke::node_find_socket(node, SOCK_IN, "Value_001");
BLI_assert(socket_2 != nullptr);
float &value_2 = socket_2->default_value_typed<bNodeSocketValueFloat>()->value;
bNodeSocket *socket_3 = bke::node_find_socket(node, SOCK_IN, "Value_002");
BLI_assert(socket_3 != nullptr);
float &value_3 = socket_3->default_value_typed<bNodeSocketValueFloat>()->value;
switch (mode) {
case NODE_MATH_MULTIPLY:
case NODE_MATH_DIVIDE:
case NODE_MATH_POWER:
case NODE_MATH_FLOORED_MODULO:
case NODE_MATH_MODULO:
case NODE_MATH_ARCTAN2:
value_2 = 1.0f;
break;
case NODE_MATH_ADD:
case NODE_MATH_SUBTRACT:
value_2 = 0.0f;
break;
case NODE_MATH_MULTIPLY_ADD:
value_2 = 1.0f;
value_3 = 0.0f;
break;
default:
/* Use the default defined in the node declaration otherwise. */
break;
}
}
class SocketSearchOp {
public:
std::string socket_name;
@ -93,6 +129,7 @@ class SocketSearchOp {
{
bNode &node = params.add_node("ShaderNodeMath");
node.custom1 = mode;
math_input_defaults(node, mode);
params.update_and_connect_available_socket(node, socket_name);
}
};