diff options
Diffstat (limited to 'source/blender/nodes/function')
3 files changed, 15 insertions, 6 deletions
diff --git a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc index ed03cc0025d..4b59b49c632 100644 --- a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc +++ b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc @@ -47,7 +47,10 @@ static void node_boolean_math_update(bNodeTree *ntree, bNode *node) ntree, sockB, ELEM(node->custom1, NODE_BOOLEAN_MATH_AND, NODE_BOOLEAN_MATH_OR)); } -static void node_boolean_math_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen) +static void node_boolean_math_label(const bNodeTree *UNUSED(ntree), + const bNode *node, + char *label, + int maxlen) { const char *name; bool enum_label = RNA_enum_name(rna_enum_node_boolean_math_items, node->custom1, &name); @@ -92,7 +95,7 @@ void register_node_type_fn_boolean_math() fn_node_type_base(&ntype, FN_NODE_BOOLEAN_MATH, "Boolean Math", NODE_CLASS_CONVERTER, 0); ntype.declare = blender::nodes::fn_node_boolean_math_declare; - node_type_label(&ntype, blender::nodes::node_boolean_math_label); + ntype.labelfunc = blender::nodes::node_boolean_math_label; node_type_update(&ntype, blender::nodes::node_boolean_math_update); ntype.build_multi_function = blender::nodes::fn_node_boolean_math_build_multi_function; ntype.draw_buttons = blender::nodes::fn_node_boolean_math_layout; diff --git a/source/blender/nodes/function/nodes/node_fn_compare.cc b/source/blender/nodes/function/nodes/node_fn_compare.cc index 5acd4ae1466..c880f0b1423 100644 --- a/source/blender/nodes/function/nodes/node_fn_compare.cc +++ b/source/blender/nodes/function/nodes/node_fn_compare.cc @@ -103,7 +103,10 @@ static void node_compare_init(bNodeTree *UNUSED(tree), bNode *node) node->storage = data; } -static void node_compare_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen) +static void node_compare_label(const bNodeTree *UNUSED(ntree), + const bNode *node, + char *label, + int maxlen) { const NodeFunctionCompare *data = (NodeFunctionCompare *)node->storage; const char *name; @@ -479,7 +482,7 @@ void register_node_type_fn_compare() static bNodeType ntype; fn_node_type_base(&ntype, FN_NODE_COMPARE, "Compare", NODE_CLASS_CONVERTER, 0); ntype.declare = file_ns::fn_node_compare_declare; - node_type_label(&ntype, file_ns::node_compare_label); + ntype.labelfunc = file_ns::node_compare_label; node_type_update(&ntype, file_ns::node_compare_update); node_type_init(&ntype, file_ns::node_compare_init); node_type_storage( diff --git a/source/blender/nodes/function/nodes/node_fn_float_to_int.cc b/source/blender/nodes/function/nodes/node_fn_float_to_int.cc index e6ec925f945..21f6734e4aa 100644 --- a/source/blender/nodes/function/nodes/node_fn_float_to_int.cc +++ b/source/blender/nodes/function/nodes/node_fn_float_to_int.cc @@ -39,7 +39,10 @@ static void fn_node_float_to_int_layout(uiLayout *layout, bContext *UNUSED(C), P uiItemR(layout, ptr, "rounding_mode", 0, "", ICON_NONE); } -static void node_float_to_int_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen) +static void node_float_to_int_label(const bNodeTree *UNUSED(ntree), + const bNode *node, + char *label, + int maxlen) { const char *name; bool enum_label = RNA_enum_name(rna_enum_node_float_to_int_items, node->custom1, &name); @@ -86,7 +89,7 @@ void register_node_type_fn_float_to_int() fn_node_type_base(&ntype, FN_NODE_FLOAT_TO_INT, "Float to Integer", NODE_CLASS_CONVERTER, 0); ntype.declare = blender::nodes::fn_node_float_to_int_declare; - node_type_label(&ntype, blender::nodes::node_float_to_int_label); + ntype.labelfunc = blender::nodes::node_float_to_int_label; ntype.build_multi_function = blender::nodes::fn_node_float_to_int_build_multi_function; ntype.draw_buttons = blender::nodes::fn_node_float_to_int_layout; nodeRegisterType(&ntype); |