diff options
Diffstat (limited to 'source/blender/nodes/function/nodes')
14 files changed, 53 insertions, 55 deletions
diff --git a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc index e5c89567d44..9e21fc86871 100644 --- a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc +++ b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc @@ -26,7 +26,7 @@ static void fn_node_align_euler_to_vector_declare(NodeDeclarationBuilder &b) } static void fn_node_align_euler_to_vector_layout(uiLayout *layout, - bContext *UNUSED(C), + bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "axis", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); @@ -159,7 +159,7 @@ class MF_AlignEulerToVector : public fn::MultiFunction { return signature.build(); } - void call(IndexMask mask, fn::MFParams params, fn::MFContext UNUSED(context)) const override + void call(IndexMask mask, fn::MFParams params, fn::MFContext /*context*/) const override { const VArray<float3> &input_rotations = params.readonly_single_input<float3>(0, "Rotation"); const VArray<float> &factors = params.readonly_single_input<float>(1, "Factor"); 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 5fc28509a49..3027a81807b 100644 --- a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc +++ b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc @@ -22,7 +22,7 @@ static void fn_node_boolean_math_declare(NodeDeclarationBuilder &b) b.add_output<decl::Bool>(N_("Boolean")); } -static void fn_node_boolean_math_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void fn_node_boolean_math_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "operation", 0, "", ICON_NONE); } @@ -34,7 +34,7 @@ static void node_boolean_math_update(bNodeTree *ntree, bNode *node) nodeSetSocketAvailability(ntree, sockB, !ELEM(node->custom1, NODE_BOOLEAN_MATH_NOT)); } -static void node_boolean_math_label(const bNodeTree *UNUSED(ntree), +static void node_boolean_math_label(const bNodeTree * /*tree*/, const bNode *node, char *label, int maxlen) @@ -131,7 +131,7 @@ void register_node_type_fn_boolean_math() fn_node_type_base(&ntype, FN_NODE_BOOLEAN_MATH, "Boolean Math", NODE_CLASS_CONVERTER); ntype.declare = file_ns::fn_node_boolean_math_declare; ntype.labelfunc = file_ns::node_boolean_math_label; - node_type_update(&ntype, file_ns::node_boolean_math_update); + ntype.updatefunc = file_ns::node_boolean_math_update; ntype.build_multi_function = file_ns::fn_node_boolean_math_build_multi_function; ntype.draw_buttons = file_ns::fn_node_boolean_math_layout; ntype.gather_link_search_ops = file_ns::node_gather_link_searches; diff --git a/source/blender/nodes/function/nodes/node_fn_combine_color.cc b/source/blender/nodes/function/nodes/node_fn_combine_color.cc index 450cd166e78..c5dd5dfff1a 100644 --- a/source/blender/nodes/function/nodes/node_fn_combine_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_combine_color.cc @@ -31,18 +31,18 @@ static void fn_node_combine_color_declare(NodeDeclarationBuilder &b) b.add_output<decl::Color>(N_("Color")); }; -static void fn_node_combine_color_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void fn_node_combine_color_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", 0, "", ICON_NONE); } -static void fn_node_combine_color_update(bNodeTree *UNUSED(ntree), bNode *node) +static void fn_node_combine_color_update(bNodeTree * /*tree*/, bNode *node) { const NodeCombSepColor &storage = node_storage(*node); node_combsep_color_label(&node->inputs, (NodeCombSepColorMode)storage.mode); } -static void fn_node_combine_color_init(bNodeTree *UNUSED(tree), bNode *node) +static void fn_node_combine_color_init(bNodeTree * /*tree*/, bNode *node) { NodeCombSepColor *data = MEM_cnew<NodeCombSepColor>(__func__); data->mode = NODE_COMBSEP_COLOR_RGB; @@ -97,8 +97,8 @@ void register_node_type_fn_combine_color(void) fn_node_type_base(&ntype, FN_NODE_COMBINE_COLOR, "Combine Color", NODE_CLASS_CONVERTER); ntype.declare = blender::nodes::fn_node_combine_color_declare; - node_type_update(&ntype, blender::nodes::fn_node_combine_color_update); - node_type_init(&ntype, blender::nodes::fn_node_combine_color_init); + ntype.updatefunc = blender::nodes::fn_node_combine_color_update; + ntype.initfunc = blender::nodes::fn_node_combine_color_init; node_type_storage( &ntype, "NodeCombSepColor", node_free_standard_storage, node_copy_standard_storage); ntype.build_multi_function = blender::nodes::fn_node_combine_color_build_multi_function; diff --git a/source/blender/nodes/function/nodes/node_fn_compare.cc b/source/blender/nodes/function/nodes/node_fn_compare.cc index 122d1a3c93e..c0eb3e9ffd5 100644 --- a/source/blender/nodes/function/nodes/node_fn_compare.cc +++ b/source/blender/nodes/function/nodes/node_fn_compare.cc @@ -44,7 +44,7 @@ static void fn_node_compare_declare(NodeDeclarationBuilder &b) b.add_output<decl::Bool>(N_("Result")); } -static void geo_node_compare_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void geo_node_compare_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { const NodeFunctionCompare &data = node_storage(*static_cast<const bNode *>(ptr->data)); uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); @@ -82,7 +82,7 @@ static void node_compare_update(bNodeTree *ntree, bNode *node) data->data_type == SOCK_VECTOR); } -static void node_compare_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_compare_init(bNodeTree * /*tree*/, bNode *node) { NodeFunctionCompare *data = MEM_cnew<NodeFunctionCompare>(__func__); data->operation = NODE_COMPARE_GREATER_THAN; @@ -148,7 +148,7 @@ static void node_compare_gather_link_searches(GatherLinkSearchOpParams ¶ms) } } -static void node_compare_label(const bNodeTree *UNUSED(ntree), +static void node_compare_label(const bNodeTree * /*tree*/, const bNode *node, char *label, int maxlen) @@ -582,8 +582,8 @@ void register_node_type_fn_compare() fn_node_type_base(&ntype, FN_NODE_COMPARE, "Compare", NODE_CLASS_CONVERTER); ntype.declare = file_ns::fn_node_compare_declare; 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); + ntype.updatefunc = file_ns::node_compare_update; + ntype.initfunc = file_ns::node_compare_init; node_type_storage( &ntype, "NodeFunctionCompare", node_free_standard_storage, node_copy_standard_storage); ntype.build_multi_function = file_ns::fn_node_compare_build_multi_function; 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 aad2f532d20..aa039309b3f 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 @@ -21,12 +21,12 @@ static void fn_node_float_to_int_declare(NodeDeclarationBuilder &b) b.add_output<decl::Int>(N_("Integer")); } -static void fn_node_float_to_int_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void fn_node_float_to_int_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "rounding_mode", 0, "", ICON_NONE); } -static void node_float_to_int_label(const bNodeTree *UNUSED(ntree), +static void node_float_to_int_label(const bNodeTree * /*tree*/, const bNode *node, char *label, int maxlen) @@ -43,13 +43,13 @@ static const fn::MultiFunction *get_multi_function(const bNode &bnode) { static auto exec_preset = fn::CustomMF_presets::AllSpanOrSingle(); static fn::CustomMF_SI_SO<float, int> round_fn{ - "Round", [](float a) { return (int)round(a); }, exec_preset}; + "Round", [](float a) { return int(round(a)); }, exec_preset}; static fn::CustomMF_SI_SO<float, int> floor_fn{ - "Floor", [](float a) { return (int)floor(a); }, exec_preset}; + "Floor", [](float a) { return int(floor(a)); }, exec_preset}; static fn::CustomMF_SI_SO<float, int> ceil_fn{ - "Ceiling", [](float a) { return (int)ceil(a); }, exec_preset}; + "Ceiling", [](float a) { return int(ceil(a)); }, exec_preset}; static fn::CustomMF_SI_SO<float, int> trunc_fn{ - "Truncate", [](float a) { return (int)trunc(a); }, exec_preset}; + "Truncate", [](float a) { return int(trunc(a)); }, exec_preset}; switch (static_cast<FloatToIntRoundingMode>(bnode.custom1)) { case FN_NODE_FLOAT_TO_INT_ROUND: diff --git a/source/blender/nodes/function/nodes/node_fn_input_bool.cc b/source/blender/nodes/function/nodes/node_fn_input_bool.cc index 717f4d1ac6b..62e0358b0ae 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_bool.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_bool.cc @@ -14,7 +14,7 @@ static void fn_node_input_bool_declare(NodeDeclarationBuilder &b) b.add_output<decl::Bool>(N_("Boolean")); } -static void fn_node_input_bool_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void fn_node_input_bool_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "boolean", UI_ITEM_R_EXPAND, IFACE_("Value"), ICON_NONE); @@ -27,7 +27,7 @@ static void fn_node_input_bool_build_multi_function(NodeMultiFunctionBuilder &bu builder.construct_and_set_matching_fn<fn::CustomMF_Constant<bool>>(node_storage->boolean); } -static void fn_node_input_bool_init(bNodeTree *UNUSED(ntree), bNode *node) +static void fn_node_input_bool_init(bNodeTree * /*tree*/, bNode *node) { NodeInputBool *data = MEM_cnew<NodeInputBool>(__func__); node->storage = data; @@ -43,7 +43,7 @@ void register_node_type_fn_input_bool() fn_node_type_base(&ntype, FN_NODE_INPUT_BOOL, "Boolean", 0); ntype.declare = file_ns::fn_node_input_bool_declare; - node_type_init(&ntype, file_ns::fn_node_input_bool_init); + ntype.initfunc = file_ns::fn_node_input_bool_init; node_type_storage( &ntype, "NodeInputBool", node_free_standard_storage, node_copy_standard_storage); ntype.build_multi_function = file_ns::fn_node_input_bool_build_multi_function; diff --git a/source/blender/nodes/function/nodes/node_fn_input_color.cc b/source/blender/nodes/function/nodes/node_fn_input_color.cc index cdad1542c66..af4c340efe7 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_color.cc @@ -14,7 +14,7 @@ static void fn_node_input_color_declare(NodeDeclarationBuilder &b) b.add_output<decl::Color>(N_("Color")); } -static void fn_node_input_color_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void fn_node_input_color_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiTemplateColorPicker(layout, ptr, "color", true, false, false, true); uiItemR(layout, ptr, "color", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); @@ -29,7 +29,7 @@ static void fn_node_input_color_build_multi_function( builder.construct_and_set_matching_fn<blender::fn::CustomMF_Constant<ColorGeometry4f>>(color); } -static void fn_node_input_color_init(bNodeTree *UNUSED(ntree), bNode *node) +static void fn_node_input_color_init(bNodeTree * /*tree*/, bNode *node) { NodeInputColor *data = MEM_cnew<NodeInputColor>(__func__); copy_v4_fl4(data->color, 0.5f, 0.5f, 0.5f, 1.0f); @@ -46,7 +46,7 @@ void register_node_type_fn_input_color() fn_node_type_base(&ntype, FN_NODE_INPUT_COLOR, "Color", NODE_CLASS_INPUT); ntype.declare = file_ns::fn_node_input_color_declare; - node_type_init(&ntype, file_ns::fn_node_input_color_init); + ntype.initfunc = file_ns::fn_node_input_color_init; node_type_storage( &ntype, "NodeInputColor", node_free_standard_storage, node_copy_standard_storage); ntype.build_multi_function = file_ns::fn_node_input_color_build_multi_function; diff --git a/source/blender/nodes/function/nodes/node_fn_input_int.cc b/source/blender/nodes/function/nodes/node_fn_input_int.cc index 16506b5f9b8..c339d2a348e 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_int.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_int.cc @@ -14,7 +14,7 @@ static void fn_node_input_int_declare(NodeDeclarationBuilder &b) b.add_output<decl::Int>(N_("Integer")); } -static void fn_node_input_int_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void fn_node_input_int_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "integer", UI_ITEM_R_EXPAND, "", ICON_NONE); @@ -27,7 +27,7 @@ static void fn_node_input_int_build_multi_function(NodeMultiFunctionBuilder &bui builder.construct_and_set_matching_fn<fn::CustomMF_Constant<int>>(node_storage->integer); } -static void fn_node_input_int_init(bNodeTree *UNUSED(ntree), bNode *node) +static void fn_node_input_int_init(bNodeTree * /*tree*/, bNode *node) { NodeInputInt *data = MEM_cnew<NodeInputInt>(__func__); node->storage = data; @@ -43,7 +43,7 @@ void register_node_type_fn_input_int() fn_node_type_base(&ntype, FN_NODE_INPUT_INT, "Integer", 0); ntype.declare = file_ns::fn_node_input_int_declare; - node_type_init(&ntype, file_ns::fn_node_input_int_init); + ntype.initfunc = file_ns::fn_node_input_int_init; node_type_storage( &ntype, "NodeInputInt", node_free_standard_storage, node_copy_standard_storage); ntype.build_multi_function = file_ns::fn_node_input_int_build_multi_function; diff --git a/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc b/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc index 88dc95aa026..b61bd6b5e22 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_special_characters.cc @@ -26,7 +26,7 @@ class MF_SpecialCharacters : public fn::MultiFunction { return signature.build(); } - void call(IndexMask mask, fn::MFParams params, fn::MFContext UNUSED(context)) const override + void call(IndexMask mask, fn::MFParams params, fn::MFContext /*context*/) const override { MutableSpan<std::string> lb = params.uninitialized_single_output<std::string>(0, "Line Break"); MutableSpan<std::string> tab = params.uninitialized_single_output<std::string>(1, "Tab"); diff --git a/source/blender/nodes/function/nodes/node_fn_input_string.cc b/source/blender/nodes/function/nodes/node_fn_input_string.cc index 129d19f4f04..9da17ef9a67 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_string.cc @@ -13,7 +13,7 @@ static void fn_node_input_string_declare(NodeDeclarationBuilder &b) b.add_output<decl::String>(N_("String")); } -static void fn_node_input_string_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void fn_node_input_string_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "string", 0, "", ICON_NONE); } @@ -26,7 +26,7 @@ static void fn_node_input_string_build_multi_function(NodeMultiFunctionBuilder & builder.construct_and_set_matching_fn<fn::CustomMF_Constant<std::string>>(std::move(string)); } -static void fn_node_input_string_init(bNodeTree *UNUSED(ntree), bNode *node) +static void fn_node_input_string_init(bNodeTree * /*tree*/, bNode *node) { node->storage = MEM_callocN(sizeof(NodeInputString), __func__); } @@ -43,9 +43,7 @@ static void fn_node_input_string_free(bNode *node) MEM_freeN(storage); } -static void fn_node_string_copy(bNodeTree *UNUSED(dest_ntree), - bNode *dest_node, - const bNode *src_node) +static void fn_node_string_copy(bNodeTree * /*dst_ntree*/, bNode *dest_node, const bNode *src_node) { NodeInputString *source_storage = (NodeInputString *)src_node->storage; NodeInputString *destination_storage = (NodeInputString *)MEM_dupallocN(source_storage); @@ -67,7 +65,7 @@ void register_node_type_fn_input_string() fn_node_type_base(&ntype, FN_NODE_INPUT_STRING, "String", NODE_CLASS_INPUT); ntype.declare = file_ns::fn_node_input_string_declare; - node_type_init(&ntype, file_ns::fn_node_input_string_init); + ntype.initfunc = file_ns::fn_node_input_string_init; node_type_storage( &ntype, "NodeInputString", file_ns::fn_node_input_string_free, file_ns::fn_node_string_copy); ntype.build_multi_function = file_ns::fn_node_input_string_build_multi_function; diff --git a/source/blender/nodes/function/nodes/node_fn_input_vector.cc b/source/blender/nodes/function/nodes/node_fn_input_vector.cc index de894a4038d..f6feda4cad0 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_vector.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_vector.cc @@ -14,7 +14,7 @@ static void fn_node_input_vector_declare(NodeDeclarationBuilder &b) b.add_output<decl::Vector>(N_("Vector")); } -static void fn_node_input_vector_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void fn_node_input_vector_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col = uiLayoutColumn(layout, true); uiItemR(col, ptr, "vector", UI_ITEM_R_EXPAND, "", ICON_NONE); @@ -28,7 +28,7 @@ static void fn_node_input_vector_build_multi_function(NodeMultiFunctionBuilder & builder.construct_and_set_matching_fn<fn::CustomMF_Constant<float3>>(vector); } -static void fn_node_input_vector_init(bNodeTree *UNUSED(ntree), bNode *node) +static void fn_node_input_vector_init(bNodeTree * /*tree*/, bNode *node) { NodeInputVector *data = MEM_cnew<NodeInputVector>(__func__); node->storage = data; @@ -44,7 +44,7 @@ void register_node_type_fn_input_vector() fn_node_type_base(&ntype, FN_NODE_INPUT_VECTOR, "Vector", 0); ntype.declare = file_ns::fn_node_input_vector_declare; - node_type_init(&ntype, file_ns::fn_node_input_vector_init); + ntype.initfunc = file_ns::fn_node_input_vector_init; node_type_storage( &ntype, "NodeInputVector", node_free_standard_storage, node_copy_standard_storage); ntype.build_multi_function = file_ns::fn_node_input_vector_build_multi_function; diff --git a/source/blender/nodes/function/nodes/node_fn_random_value.cc b/source/blender/nodes/function/nodes/node_fn_random_value.cc index 360695299cb..c923e6e7d16 100644 --- a/source/blender/nodes/function/nodes/node_fn_random_value.cc +++ b/source/blender/nodes/function/nodes/node_fn_random_value.cc @@ -33,7 +33,7 @@ static void fn_node_random_value_declare(NodeDeclarationBuilder &b) .subtype(PROP_FACTOR) .supports_field() .make_available([](bNode &node) { node_storage(node).data_type = CD_PROP_BOOL; }); - b.add_input<decl::Int>(N_("ID")).implicit_field(); + b.add_input<decl::Int>(N_("ID")).implicit_field(implicit_field_inputs::id_or_index); b.add_input<decl::Int>(N_("Seed")).default_value(0).min(-10000).max(10000).supports_field(); b.add_output<decl::Vector>(N_("Value")).dependent_field(); @@ -42,12 +42,12 @@ static void fn_node_random_value_declare(NodeDeclarationBuilder &b) b.add_output<decl::Bool>(N_("Value"), "Value_003").dependent_field(); } -static void fn_node_random_value_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void fn_node_random_value_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); } -static void fn_node_random_value_init(bNodeTree *UNUSED(tree), bNode *node) +static void fn_node_random_value_init(bNodeTree * /*tree*/, bNode *node) { NodeRandomValue *data = MEM_cnew<NodeRandomValue>(__func__); data->data_type = CD_PROP_FLOAT; @@ -218,8 +218,8 @@ void register_node_type_fn_random_value() static bNodeType ntype; fn_node_type_base(&ntype, FN_NODE_RANDOM_VALUE, "Random Value", NODE_CLASS_CONVERTER); - node_type_init(&ntype, file_ns::fn_node_random_value_init); - node_type_update(&ntype, file_ns::fn_node_random_value_update); + ntype.initfunc = file_ns::fn_node_random_value_init; + ntype.updatefunc = file_ns::fn_node_random_value_update; ntype.draw_buttons = file_ns::fn_node_random_value_layout; ntype.declare = file_ns::fn_node_random_value_declare; ntype.build_multi_function = file_ns::fn_node_random_value_build_multi_function; diff --git a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc index 299c0f7a932..19afadb7a33 100644 --- a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc +++ b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc @@ -46,7 +46,7 @@ static void fn_node_rotate_euler_update(bNodeTree *ntree, bNode *node) ntree, angle_socket, ELEM(node->custom1, FN_NODE_ROTATE_EULER_TYPE_AXIS_ANGLE)); } -static void fn_node_rotate_euler_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void fn_node_rotate_euler_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "type", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); uiItemR(layout, ptr, "space", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); @@ -132,7 +132,7 @@ void register_node_type_fn_rotate_euler() fn_node_type_base(&ntype, FN_NODE_ROTATE_EULER, "Rotate Euler", NODE_CLASS_CONVERTER); ntype.declare = file_ns::fn_node_rotate_euler_declare; ntype.draw_buttons = file_ns::fn_node_rotate_euler_layout; - node_type_update(&ntype, file_ns::fn_node_rotate_euler_update); + ntype.updatefunc = file_ns::fn_node_rotate_euler_update; ntype.build_multi_function = file_ns::fn_node_rotate_euler_build_multi_function; nodeRegisterType(&ntype); } diff --git a/source/blender/nodes/function/nodes/node_fn_separate_color.cc b/source/blender/nodes/function/nodes/node_fn_separate_color.cc index 19613427835..e3efb76d155 100644 --- a/source/blender/nodes/function/nodes/node_fn_separate_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_separate_color.cc @@ -19,18 +19,18 @@ static void fn_node_separate_color_declare(NodeDeclarationBuilder &b) b.add_output<decl::Float>(N_("Alpha")); }; -static void fn_node_separate_color_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void fn_node_separate_color_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", 0, "", ICON_NONE); } -static void fn_node_separate_color_update(bNodeTree *UNUSED(ntree), bNode *node) +static void fn_node_separate_color_update(bNodeTree * /*tree*/, bNode *node) { const NodeCombSepColor &storage = node_storage(*node); node_combsep_color_label(&node->outputs, (NodeCombSepColorMode)storage.mode); } -static void fn_node_separate_color_init(bNodeTree *UNUSED(tree), bNode *node) +static void fn_node_separate_color_init(bNodeTree * /*tree*/, bNode *node) { NodeCombSepColor *data = MEM_cnew<NodeCombSepColor>(__func__); data->mode = NODE_COMBSEP_COLOR_RGB; @@ -56,7 +56,7 @@ class SeparateRGBAFunction : public fn::MultiFunction { return signature.build(); } - void call(IndexMask mask, fn::MFParams params, fn::MFContext UNUSED(context)) const override + void call(IndexMask mask, fn::MFParams params, fn::MFContext /*context*/) const override { const VArray<ColorGeometry4f> &colors = params.readonly_single_input<ColorGeometry4f>(0, "Color"); @@ -117,7 +117,7 @@ class SeparateHSVAFunction : public fn::MultiFunction { return signature.build(); } - void call(IndexMask mask, fn::MFParams params, fn::MFContext UNUSED(context)) const override + void call(IndexMask mask, fn::MFParams params, fn::MFContext /*context*/) const override { const VArray<ColorGeometry4f> &colors = params.readonly_single_input<ColorGeometry4f>(0, "Color"); @@ -157,7 +157,7 @@ class SeparateHSLAFunction : public fn::MultiFunction { return signature.build(); } - void call(IndexMask mask, fn::MFParams params, fn::MFContext UNUSED(context)) const override + void call(IndexMask mask, fn::MFParams params, fn::MFContext /*context*/) const override { const VArray<ColorGeometry4f> &colors = params.readonly_single_input<ColorGeometry4f>(0, "Color"); @@ -213,8 +213,8 @@ void register_node_type_fn_separate_color(void) fn_node_type_base(&ntype, FN_NODE_SEPARATE_COLOR, "Separate Color", NODE_CLASS_CONVERTER); ntype.declare = blender::nodes::fn_node_separate_color_declare; - node_type_update(&ntype, blender::nodes::fn_node_separate_color_update); - node_type_init(&ntype, blender::nodes::fn_node_separate_color_init); + ntype.updatefunc = blender::nodes::fn_node_separate_color_update; + ntype.initfunc = blender::nodes::fn_node_separate_color_init; node_type_storage( &ntype, "NodeCombSepColor", node_free_standard_storage, node_copy_standard_storage); ntype.build_multi_function = blender::nodes::fn_node_separate_color_build_multi_function; |