[Bf-blender-cvs] [12663d2e213] functions: cleanup boolean math
Jacques Lucke
noreply at git.blender.org
Fri Sep 6 16:56:02 CEST 2019
Commit: 12663d2e213310c85471aa4e64d6814402cef028
Author: Jacques Lucke
Date: Fri Sep 6 15:34:03 2019 +0200
Branches: functions
https://developer.blender.org/rB12663d2e213310c85471aa4e64d6814402cef028
cleanup boolean math
===================================================================
M source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
===================================================================
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp b/source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
index 565505dc24d..5f1eef87082 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
@@ -351,7 +351,8 @@ static void INSERT_compare(VTreeDataGraphBuilder &builder, VirtualNode *vnode)
{"use_list__b", Functions::GET_FN_output_float_0()}});
builder.insert_matching_function(fn, vnode);
}
-static SharedFunction &get_boolean_function(int operation)
+
+static SharedFunction &get_boolean_math_function(int operation)
{
switch (operation) {
case 1:
@@ -366,11 +367,11 @@ static SharedFunction &get_boolean_function(int operation)
}
}
-static void INSERT_boolean(VTreeDataGraphBuilder &builder, VirtualNode *vnode)
+static void INSERT_boolean_math(VTreeDataGraphBuilder &builder, VirtualNode *vnode)
{
PointerRNA rna = vnode->rna();
int operation = RNA_enum_get(&rna, "operation");
- SharedFunction &original_fn = get_boolean_function(operation);
+ SharedFunction &original_fn = get_boolean_math_function(operation);
uint input_amount = original_fn->input_amount();
if (input_amount == 1) {
SharedFunction fn = get_vectorized_function(
@@ -415,7 +416,7 @@ void REGISTER_node_inserters(std::unique_ptr<NodeInserters> &inserters)
REGISTER_INSERTER("fn_SeparateVectorNode", INSERT_separate_vector);
REGISTER_INSERTER("fn_SwitchNode", INSERT_switch);
REGISTER_INSERTER("fn_VectorMathNode", INSERT_vector_math);
- REGISTER_INSERTER("fn_BooleanMathNode", INSERT_boolean);
+ REGISTER_INSERTER("fn_BooleanMathNode", INSERT_boolean_math);
#undef REGISTER_INSERTER
#undef REGISTER_FUNCTION
More information about the Bf-blender-cvs
mailing list