From 97746129d5870beedc40e3c035c7982ce8a6bebc Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Mon, 3 Oct 2022 17:37:25 -0500 Subject: Cleanup: replace UNUSED macro with commented args in C++ code This is the conventional way of dealing with unused arguments in C++, since it works on all compilers. Regex find and replace: `UNUSED\((\w+)\)` -> `/*$1*/` --- source/blender/editors/space_node/drawnode.cc | 106 ++++++++++----------- source/blender/editors/space_node/node_add.cc | 6 +- source/blender/editors/space_node/node_draw.cc | 12 +-- source/blender/editors/space_node/node_edit.cc | 48 +++++----- .../space_node/node_geometry_attribute_search.cc | 2 +- source/blender/editors/space_node/node_gizmo.cc | 20 ++-- source/blender/editors/space_node/node_group.cc | 4 +- .../editors/space_node/node_relationships.cc | 20 ++-- source/blender/editors/space_node/node_select.cc | 12 +-- .../blender/editors/space_node/node_templates.cc | 2 +- source/blender/editors/space_node/node_view.cc | 4 +- source/blender/editors/space_node/space_node.cc | 26 +++-- 12 files changed, 127 insertions(+), 135 deletions(-) (limited to 'source/blender/editors/space_node') diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc index 93166c6de59..df31a0342cb 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -73,10 +73,10 @@ namespace blender::ed::space_node { /* ****************** SOCKET BUTTON DRAW FUNCTIONS ***************** */ -static void node_socket_button_label(bContext *UNUSED(C), +static void node_socket_button_label(bContext * /*C*/, uiLayout *layout, - PointerRNA *UNUSED(ptr), - PointerRNA *UNUSED(node_ptr), + PointerRNA * /*ptr*/, + PointerRNA * /*node_ptr*/, const char *text) { uiItemL(layout, text, 0); @@ -84,7 +84,7 @@ static void node_socket_button_label(bContext *UNUSED(C), /* ****************** BUTTON CALLBACKS FOR ALL TREES ***************** */ -static void node_buts_value(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_value(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { bNode *node = (bNode *)ptr->data; /* first output stores value */ @@ -95,7 +95,7 @@ static void node_buts_value(uiLayout *layout, bContext *UNUSED(C), PointerRNA *p uiItemR(layout, &sockptr, "default_value", DEFAULT_FLAGS, "", ICON_NONE); } -static void node_buts_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_rgb(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { bNode *node = (bNode *)ptr->data; /* first output stores value */ @@ -109,7 +109,7 @@ static void node_buts_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr uiItemR(col, &sockptr, "default_value", DEFAULT_FLAGS | UI_ITEM_R_SLIDER, "", ICON_NONE); } -static void node_buts_mix_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_mix_rgb(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { bNodeTree *ntree = (bNodeTree *)ptr->owner_id; @@ -123,7 +123,7 @@ static void node_buts_mix_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA uiItemR(col, ptr, "use_clamp", DEFAULT_FLAGS, nullptr, ICON_NONE); } -static void node_buts_time(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_time(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiTemplateCurveMapping(layout, ptr, "curve", 's', false, false, false, false); @@ -132,17 +132,17 @@ static void node_buts_time(uiLayout *layout, bContext *UNUSED(C), PointerRNA *pt uiItemR(col, ptr, "frame_end", DEFAULT_FLAGS, IFACE_("End"), ICON_NONE); } -static void node_buts_colorramp(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_colorramp(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiTemplateColorRamp(layout, ptr, "color_ramp", false); } -static void node_buts_curvevec(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_curvevec(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiTemplateCurveMapping(layout, ptr, "mapping", 'v', false, false, false, false); } -static void node_buts_curvefloat(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_curvefloat(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiTemplateCurveMapping(layout, ptr, "mapping", 0, false, false, false, false); } @@ -164,7 +164,7 @@ void ED_node_sample_set(const float col[4]) namespace blender::ed::space_node { -static void node_buts_curvecol(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_curvecol(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { bNode *node = (bNode *)ptr->data; CurveMapping *cumap = (CurveMapping *)node->storage; @@ -183,7 +183,7 @@ static void node_buts_curvecol(uiLayout *layout, bContext *UNUSED(C), PointerRNA layout, ptr, "mapping", 'c', false, false, false, (ntree->type == NTREE_COMPOSIT)); } -static void node_buts_normal(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_normal(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { bNode *node = (bNode *)ptr->data; /* first output stores normal */ @@ -194,7 +194,7 @@ static void node_buts_normal(uiLayout *layout, bContext *UNUSED(C), PointerRNA * uiItemR(layout, &sockptr, "default_value", DEFAULT_FLAGS, "", ICON_NONE); } -static void node_buts_texture(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_texture(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { bNode *node = (bNode *)ptr->data; @@ -209,13 +209,13 @@ static void node_buts_texture(uiLayout *layout, bContext *UNUSED(C), PointerRNA } } -static void node_buts_math(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_math(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "operation", DEFAULT_FLAGS, "", ICON_NONE); uiItemR(layout, ptr, "use_clamp", DEFAULT_FLAGS, nullptr, ICON_NONE); } -static void node_buts_combsep_color(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_combsep_color(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", DEFAULT_FLAGS, "", ICON_NONE); } @@ -283,7 +283,7 @@ static void node_draw_buttons_group(uiLayout *layout, bContext *C, PointerRNA *p layout, C, ptr, "node_tree", nullptr, nullptr, nullptr, UI_TEMPLATE_ID_FILTER_ALL, nullptr); } -static void node_buts_frame_ex(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_frame_ex(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "label_size", DEFAULT_FLAGS, IFACE_("Label Size"), ICON_NONE); uiItemR(layout, ptr, "shrink", DEFAULT_FLAGS, IFACE_("Shrink"), ICON_NONE); @@ -441,17 +441,17 @@ static void node_shader_buts_tex_environment_ex(uiLayout *layout, bContext *C, P uiItemR(layout, ptr, "projection", DEFAULT_FLAGS, IFACE_("Projection"), ICON_NONE); } -static void node_shader_buts_displacement(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_displacement(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "space", DEFAULT_FLAGS, "", 0); } -static void node_shader_buts_glossy(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_glossy(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "distribution", DEFAULT_FLAGS, "", ICON_NONE); } -static void node_buts_output_shader(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_output_shader(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "target", DEFAULT_FLAGS, "", ICON_NONE); } @@ -519,7 +519,7 @@ static void node_shader_set_butfunc(bNodeType *ntype) /* ****************** BUTTON CALLBACKS FOR COMPOSITE NODES ***************** */ static void node_buts_image_views(uiLayout *layout, - bContext *UNUSED(C), + bContext * /*C*/, PointerRNA *ptr, PointerRNA *imaptr) { @@ -579,7 +579,7 @@ static void node_composit_buts_image_ex(uiLayout *layout, bContext *C, PointerRN uiTemplateImage(layout, C, ptr, "image", &iuserptr, false, true); } -static void node_composit_buts_huecorrect(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_huecorrect(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { bNode *node = (bNode *)ptr->data; CurveMapping *cumap = (CurveMapping *)node->storage; @@ -595,14 +595,12 @@ static void node_composit_buts_huecorrect(uiLayout *layout, bContext *UNUSED(C), uiTemplateCurveMapping(layout, ptr, "mapping", 'h', false, false, false, false); } -static void node_composit_buts_ycc(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_ycc(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", DEFAULT_FLAGS, "", ICON_NONE); } -static void node_composit_buts_combsep_color(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) +static void node_composit_buts_combsep_color(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { bNode *node = (bNode *)ptr->data; NodeCMPCombSepColor *storage = (NodeCMPCombSepColor *)node->storage; @@ -733,7 +731,7 @@ static void node_composit_backdrop_ellipsemask( } static void node_composit_buts_cryptomatte_legacy(uiLayout *layout, - bContext *UNUSED(C), + bContext * /*C*/, PointerRNA *ptr) { uiLayout *col = uiLayoutColumn(layout, true); @@ -748,8 +746,8 @@ static void node_composit_buts_cryptomatte_legacy(uiLayout *layout, } static void node_composit_buts_cryptomatte_legacy_ex(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *UNUSED(ptr)) + bContext * /*C*/, + PointerRNA * /*ptr*/) { uiItemO(layout, IFACE_("Add Crypto Layer"), ICON_ADD, "NODE_OT_cryptomatte_layer_add"); uiItemO(layout, IFACE_("Remove Crypto Layer"), ICON_REMOVE, "NODE_OT_cryptomatte_layer_remove"); @@ -874,7 +872,7 @@ static void node_composit_set_butfunc(bNodeType *ntype) /* ****************** BUTTON CALLBACKS FOR TEXTURE NODES ***************** */ -static void node_texture_buts_bricks(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_texture_buts_bricks(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; @@ -887,7 +885,7 @@ static void node_texture_buts_bricks(uiLayout *layout, bContext *UNUSED(C), Poin uiItemR(col, ptr, "squash_frequency", DEFAULT_FLAGS, IFACE_("Frequency"), ICON_NONE); } -static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_texture_buts_proc(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { PointerRNA tex_ptr; bNode *node = (bNode *)ptr->data; @@ -998,12 +996,12 @@ static void node_texture_buts_image_ex(uiLayout *layout, bContext *C, PointerRNA uiTemplateImage(layout, C, ptr, "image", &iuserptr, false, false); } -static void node_texture_buts_output(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_texture_buts_output(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "filepath", DEFAULT_FLAGS, "", ICON_NONE); } -static void node_texture_buts_combsep_color(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_texture_buts_combsep_color(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", DEFAULT_FLAGS, "", ICON_NONE); } @@ -1068,7 +1066,7 @@ static void node_texture_set_butfunc(bNodeType *ntype) * Only called on node initialization, once. * \{ */ -static void node_property_update_default(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) +static void node_property_update_default(Main *bmain, Scene * /*scene*/, PointerRNA *ptr) { bNodeTree *ntree = (bNodeTree *)ptr->owner_id; bNode *node = (bNode *)ptr->data; @@ -1102,18 +1100,18 @@ static void node_template_properties_update(bNodeType *ntype) } } -static void node_socket_undefined_draw(bContext *UNUSED(C), +static void node_socket_undefined_draw(bContext * /*C*/, uiLayout *layout, - PointerRNA *UNUSED(ptr), - PointerRNA *UNUSED(node_ptr), - const char *UNUSED(text)) + PointerRNA * /*ptr*/, + PointerRNA * /*node_ptr*/, + const char * /*text*/) { uiItemL(layout, IFACE_("Undefined Socket Type"), ICON_ERROR); } -static void node_socket_undefined_draw_color(bContext *UNUSED(C), - PointerRNA *UNUSED(ptr), - PointerRNA *UNUSED(node_ptr), +static void node_socket_undefined_draw_color(bContext * /*C*/, + PointerRNA * /*ptr*/, + PointerRNA * /*node_ptr*/, float *r_color) { r_color[0] = 1.0f; @@ -1122,15 +1120,15 @@ static void node_socket_undefined_draw_color(bContext *UNUSED(C), r_color[3] = 1.0f; } -static void node_socket_undefined_interface_draw(bContext *UNUSED(C), +static void node_socket_undefined_interface_draw(bContext * /*C*/, uiLayout *layout, - PointerRNA *UNUSED(ptr)) + PointerRNA * /*ptr*/) { uiItemL(layout, IFACE_("Undefined Socket Type"), ICON_ERROR); } -static void node_socket_undefined_interface_draw_color(bContext *UNUSED(C), - PointerRNA *UNUSED(ptr), +static void node_socket_undefined_interface_draw_color(bContext * /*C*/, + PointerRNA * /*ptr*/, float *r_color) { r_color[0] = 1.0f; @@ -1173,7 +1171,7 @@ void ED_node_init_butfuncs() NODE_TYPES_END; } -void ED_init_custom_node_type(bNodeType *UNUSED(ntype)) +void ED_init_custom_node_type(bNodeType * /*ntype*/) { } @@ -1205,18 +1203,16 @@ static const float std_node_socket_colors[][4] = { }; /* common color callbacks for standard types */ -static void std_node_socket_draw_color(bContext *UNUSED(C), +static void std_node_socket_draw_color(bContext * /*C*/, PointerRNA *ptr, - PointerRNA *UNUSED(node_ptr), + PointerRNA * /*node_ptr*/, float *r_color) { bNodeSocket *sock = (bNodeSocket *)ptr->data; int type = sock->typeinfo->type; copy_v4_v4(r_color, std_node_socket_colors[type]); } -static void std_node_socket_interface_draw_color(bContext *UNUSED(C), - PointerRNA *ptr, - float *r_color) +static void std_node_socket_interface_draw_color(bContext * /*C*/, PointerRNA *ptr, float *r_color) { bNodeSocket *sock = (bNodeSocket *)ptr->data; int type = sock->typeinfo->type; @@ -1425,7 +1421,7 @@ static void std_node_socket_draw( } } -static void std_node_socket_interface_draw(bContext *UNUSED(C), uiLayout *layout, PointerRNA *ptr) +static void std_node_socket_interface_draw(bContext * /*C*/, uiLayout *layout, PointerRNA *ptr) { bNodeSocket *sock = (bNodeSocket *)ptr->data; int type = sock->typeinfo->type; @@ -1469,9 +1465,9 @@ static void std_node_socket_interface_draw(bContext *UNUSED(C), uiLayout *layout uiItemR(layout, ptr, "hide_value", DEFAULT_FLAGS, nullptr, 0); } -static void node_socket_virtual_draw_color(bContext *UNUSED(C), - PointerRNA *UNUSED(ptr), - PointerRNA *UNUSED(node_ptr), +static void node_socket_virtual_draw_color(bContext * /*C*/, + PointerRNA * /*ptr*/, + PointerRNA * /*node_ptr*/, float *r_color) { copy_v4_v4(r_color, virtual_node_socket_color); @@ -1908,7 +1904,7 @@ static void nodelink_batch_draw(const SpaceNode &snode) GPU_blend(GPU_BLEND_NONE); } -void nodelink_batch_start(SpaceNode &UNUSED(snode)) +void nodelink_batch_start(SpaceNode & /*snode*/) { g_batch_link.enabled = true; } diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc index 10e903ca79b..984f9647b34 100644 --- a/source/blender/editors/space_node/node_add.cc +++ b/source/blender/editors/space_node/node_add.cc @@ -782,9 +782,9 @@ static int new_node_tree_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static const EnumPropertyItem *new_node_tree_type_itemf(bContext *UNUSED(C), - PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), +static const EnumPropertyItem *new_node_tree_type_itemf(bContext * /*C*/, + PointerRNA * /*ptr*/, + PropertyRNA * /*prop*/, bool *r_free) { return rna_node_tree_type_itemf(nullptr, nullptr, r_free); diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index 29dad103dc3..dc155f5e28d 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -1079,7 +1079,7 @@ static bool node_socket_has_tooltip(const bNodeTree &ntree, const bNodeSocket &s static char *node_socket_get_tooltip(const bContext *C, const bNodeTree *ntree, - const bNode *UNUSED(node), + const bNode * /*node*/, const bNodeSocket *socket) { SpaceNode *snode = CTX_wm_space_node(C); @@ -1121,7 +1121,7 @@ static char *node_socket_get_tooltip(const bContext *C, return BLI_strdup(output.str().c_str()); } -static void node_socket_add_tooltip_in_node_editor(TreeDrawContext *UNUSED(tree_draw_ctx), +static void node_socket_add_tooltip_in_node_editor(TreeDrawContext * /*tree_draw_ctx*/, const bNodeTree *ntree, const bNode *node, const bNodeSocket *sock, @@ -1138,7 +1138,7 @@ static void node_socket_add_tooltip_in_node_editor(TreeDrawContext *UNUSED(tree_ uiLayoutSetTooltipFunc( layout, - [](bContext *C, void *argN, const char *UNUSED(tip)) { + [](bContext *C, void *argN, const char * /*tip*/) { SocketTooltipData *data = static_cast(argN); return node_socket_get_tooltip(C, data->ntree, data->node, data->socket); }, @@ -1217,7 +1217,7 @@ static void node_socket_draw_nested(const bContext &C, UI_but_func_tooltip_set( but, - [](bContext *C, void *argN, const char *UNUSED(tip)) { + [](bContext *C, void *argN, const char * /*tip*/) { SocketTooltipData *data = (SocketTooltipData *)argN; return node_socket_get_tooltip(C, data->ntree, data->node, data->socket); }, @@ -1626,7 +1626,7 @@ struct NodeErrorsTooltipData { Span warnings; }; -static char *node_errors_tooltip_fn(bContext *UNUSED(C), void *argN, const char *UNUSED(tip)) +static char *node_errors_tooltip_fn(bContext * /*C*/, void *argN, const char * /*tip*/) { NodeErrorsTooltipData &data = *(NodeErrorsTooltipData *)argN; @@ -1786,7 +1786,7 @@ struct NamedAttributeTooltipArg { Map usage_by_attribute; }; -static char *named_attribute_tooltip(bContext *UNUSED(C), void *argN, const char *UNUSED(tip)) +static char *named_attribute_tooltip(bContext * /*C*/, void *argN, const char * /*tip*/) { NamedAttributeTooltipArg &arg = *static_cast(argN); diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc index 8135369f271..3a80733f06c 100644 --- a/source/blender/editors/space_node/node_edit.cc +++ b/source/blender/editors/space_node/node_edit.cc @@ -179,7 +179,7 @@ static int compo_breakjob(void *cjv) } /* called by compo, wmJob sends notifier */ -static void compo_statsdrawjob(void *cjv, const char *UNUSED(str)) +static void compo_statsdrawjob(void *cjv, const char * /*str*/) { CompoJob *cj = (CompoJob *)cjv; @@ -234,7 +234,7 @@ static void compo_initjob(void *cjv) } /* called before redraw notifiers, it moves finished previews over */ -static void compo_updatejob(void *UNUSED(cjv)) +static void compo_updatejob(void * /*cjv*/) { WM_main_add_notifier(NC_SCENE | ND_COMPO_RESULT, nullptr); } @@ -443,11 +443,11 @@ void ED_node_tree_propagate_change(const bContext *C, Main *bmain, bNodeTree *ro } NodeTreeUpdateExtraParams params = {nullptr}; - params.tree_changed_fn = [](ID *id, bNodeTree *ntree, void *UNUSED(user_data)) { + params.tree_changed_fn = [](ID *id, bNodeTree *ntree, void * /*user_data*/) { blender::ed::space_node::send_notifiers_after_tree_change(id, ntree); DEG_id_tag_update(&ntree->id, ID_RECALC_COPY_ON_WRITE); }; - params.tree_output_changed_fn = [](ID *UNUSED(id), bNodeTree *ntree, void *UNUSED(user_data)) { + params.tree_output_changed_fn = [](ID * /*id*/, bNodeTree *ntree, void * /*user_data*/) { DEG_id_tag_update(&ntree->id, ID_RECALC_NTREE_OUTPUT); }; @@ -828,7 +828,7 @@ void ED_node_set_active( } } -void ED_node_post_apply_transform(bContext *UNUSED(C), bNodeTree *UNUSED(ntree)) +void ED_node_post_apply_transform(bContext * /*C*/, bNodeTree * /*ntree*/) { /* XXX This does not work due to layout functions relying on node->block, * which only exists during actual drawing. Can we rely on valid totr rects? @@ -1481,7 +1481,7 @@ void NODE_OT_duplicate(wmOperatorType *ot) /* XXX: some code needing updating to operators. */ /* goes over all scenes, reads render layers */ -static int node_read_viewlayers_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_read_viewlayers_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); SpaceNode *snode = CTX_wm_space_node(C); @@ -1529,7 +1529,7 @@ void NODE_OT_read_viewlayers(wmOperatorType *ot) ot->flag = 0; } -int node_render_changed_exec(bContext *C, wmOperator *UNUSED(op)) +int node_render_changed_exec(bContext *C, wmOperator * /*op*/) { Scene *sce = CTX_data_scene(C); @@ -1636,7 +1636,7 @@ static void node_flag_toggle_exec(SpaceNode *snode, int toggle_flag) } } -static int node_hide_toggle_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_hide_toggle_exec(bContext *C, wmOperator * /*op*/) { SpaceNode *snode = CTX_wm_space_node(C); @@ -1667,7 +1667,7 @@ void NODE_OT_hide_toggle(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static int node_preview_toggle_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_preview_toggle_exec(bContext *C, wmOperator * /*op*/) { SpaceNode *snode = CTX_wm_space_node(C); @@ -1700,7 +1700,7 @@ void NODE_OT_preview_toggle(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static int node_deactivate_viewer_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_deactivate_viewer_exec(bContext *C, wmOperator * /*op*/) { SpaceNode &snode = *CTX_wm_space_node(C); WorkSpace &workspace = *CTX_wm_workspace(C); @@ -1740,7 +1740,7 @@ void NODE_OT_deactivate_viewer(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static int node_options_toggle_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_options_toggle_exec(bContext *C, wmOperator * /*op*/) { SpaceNode *snode = CTX_wm_space_node(C); @@ -1771,7 +1771,7 @@ void NODE_OT_options_toggle(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static int node_socket_toggle_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_socket_toggle_exec(bContext *C, wmOperator * /*op*/) { SpaceNode *snode = CTX_wm_space_node(C); @@ -1827,7 +1827,7 @@ void NODE_OT_hide_socket_toggle(wmOperatorType *ot) /** \name Node Mute Operator * \{ */ -static int node_mute_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_mute_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); SpaceNode *snode = CTX_wm_space_node(C); @@ -1867,7 +1867,7 @@ void NODE_OT_mute_toggle(wmOperatorType *ot) /** \name Node Delete Operator * \{ */ -static int node_delete_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_delete_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); SpaceNode *snode = CTX_wm_space_node(C); @@ -1917,7 +1917,7 @@ static bool node_switch_view_poll(bContext *C) return false; } -static int node_switch_view_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_switch_view_exec(bContext *C, wmOperator * /*op*/) { SpaceNode *snode = CTX_wm_space_node(C); @@ -1954,7 +1954,7 @@ void NODE_OT_switch_view_update(wmOperatorType *ot) /** \name Node Delete with Reconnect Operator * \{ */ -static int node_delete_reconnect_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_delete_reconnect_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); SpaceNode *snode = CTX_wm_space_node(C); @@ -2048,7 +2048,7 @@ void NODE_OT_output_file_add_socket(wmOperatorType *ot) /** \name Node Multi File Output Remove Socket Operator * \{ */ -static int node_output_file_remove_active_socket_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_output_file_remove_active_socket_exec(bContext *C, wmOperator * /*op*/) { SpaceNode *snode = CTX_wm_space_node(C); PointerRNA ptr = CTX_data_pointer_get(C, "node"); @@ -2174,7 +2174,7 @@ void NODE_OT_output_file_move_active_socket(wmOperatorType *ot) /** \name Node Copy Node Color Operator * \{ */ -static int node_copy_color_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_copy_color_exec(bContext *C, wmOperator * /*op*/) { SpaceNode &snode = *CTX_wm_space_node(C); bNodeTree &ntree = *snode.edittree; @@ -2222,7 +2222,7 @@ void NODE_OT_node_copy_color(wmOperatorType *ot) /** \name Node Copy to Clipboard Operator * \{ */ -static int node_clipboard_copy_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_clipboard_copy_exec(bContext *C, wmOperator * /*op*/) { SpaceNode *snode = CTX_wm_space_node(C); bNodeTree *ntree = snode->edittree; @@ -2615,8 +2615,8 @@ static bool socket_change_poll_type(void *userdata, bNodeSocketType *socket_type } static const EnumPropertyItem *socket_change_type_itemf(bContext *C, - PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), + PointerRNA * /*ptr*/, + PropertyRNA * /*prop*/, bool *r_free) { if (!C) { @@ -2980,7 +2980,7 @@ void NODE_OT_viewer_border(wmOperatorType *ot) WM_operator_properties_gesture_box(ot); } -static int clear_viewer_border_exec(bContext *C, wmOperator *UNUSED(op)) +static int clear_viewer_border_exec(bContext *C, wmOperator * /*op*/) { SpaceNode *snode = CTX_wm_space_node(C); bNodeTree *btree = snode->nodetree; @@ -3013,7 +3013,7 @@ void NODE_OT_clear_viewer_border(wmOperatorType *ot) /** \name Cryptomatte Add Socket * \{ */ -static int node_cryptomatte_add_socket_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_cryptomatte_add_socket_exec(bContext *C, wmOperator * /*op*/) { SpaceNode *snode = CTX_wm_space_node(C); PointerRNA ptr = CTX_data_pointer_get(C, "node"); @@ -3061,7 +3061,7 @@ void NODE_OT_cryptomatte_layer_add(wmOperatorType *ot) /** \name Cryptomatte Remove Socket * \{ */ -static int node_cryptomatte_remove_socket_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_cryptomatte_remove_socket_exec(bContext *C, wmOperator * /*op*/) { SpaceNode *snode = CTX_wm_space_node(C); PointerRNA ptr = CTX_data_pointer_get(C, "node"); diff --git a/source/blender/editors/space_node/node_geometry_attribute_search.cc b/source/blender/editors/space_node/node_geometry_attribute_search.cc index 809c4b2fe59..a1a8fd0dfdc 100644 --- a/source/blender/editors/space_node/node_geometry_attribute_search.cc +++ b/source/blender/editors/space_node/node_geometry_attribute_search.cc @@ -213,7 +213,7 @@ static void attribute_search_exec_fn(bContext *C, void *data_v, void *item_v) ED_undo_push(C, "Assign Attribute Name"); } -void node_geometry_add_attribute_search_button(const bContext &UNUSED(C), +void node_geometry_add_attribute_search_button(const bContext & /*C*/, const bNode &node, PointerRNA &socket_ptr, uiLayout &layout) diff --git a/source/blender/editors/space_node/node_gizmo.cc b/source/blender/editors/space_node/node_gizmo.cc index a6c9538d782..7a77d523f43 100644 --- a/source/blender/editors/space_node/node_gizmo.cc +++ b/source/blender/editors/space_node/node_gizmo.cc @@ -65,7 +65,7 @@ static void node_gizmo_calc_matrix_space_with_image_dims(const SpaceNode *snode, /** \name Backdrop Gizmo * \{ */ -static void gizmo_node_backdrop_prop_matrix_get(const wmGizmo *UNUSED(gz), +static void gizmo_node_backdrop_prop_matrix_get(const wmGizmo * /*gz*/, wmGizmoProperty *gz_prop, void *value_p) { @@ -78,7 +78,7 @@ static void gizmo_node_backdrop_prop_matrix_get(const wmGizmo *UNUSED(gz), matrix[3][1] = snode->yof; } -static void gizmo_node_backdrop_prop_matrix_set(const wmGizmo *UNUSED(gz), +static void gizmo_node_backdrop_prop_matrix_set(const wmGizmo * /*gz*/, wmGizmoProperty *gz_prop, const void *value_p) { @@ -90,7 +90,7 @@ static void gizmo_node_backdrop_prop_matrix_set(const wmGizmo *UNUSED(gz), snode->yof = matrix[3][1]; } -static bool WIDGETGROUP_node_transform_poll(const bContext *C, wmGizmoGroupType *UNUSED(gzgt)) +static bool WIDGETGROUP_node_transform_poll(const bContext *C, wmGizmoGroupType * /*gzgt*/) { SpaceNode *snode = CTX_wm_space_node(C); @@ -109,7 +109,7 @@ static bool WIDGETGROUP_node_transform_poll(const bContext *C, wmGizmoGroupType return false; } -static void WIDGETGROUP_node_transform_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup) +static void WIDGETGROUP_node_transform_setup(const bContext * /*C*/, wmGizmoGroup *gzgroup) { wmGizmoWrapper *wwrapper = (wmGizmoWrapper *)MEM_mallocN(sizeof(wmGizmoWrapper), __func__); @@ -294,7 +294,7 @@ static void gizmo_node_crop_prop_matrix_set(const wmGizmo *gz, gizmo_node_crop_update(crop_group); } -static bool WIDGETGROUP_node_crop_poll(const bContext *C, wmGizmoGroupType *UNUSED(gzgt)) +static bool WIDGETGROUP_node_crop_poll(const bContext *C, wmGizmoGroupType * /*gzgt*/) { SpaceNode *snode = CTX_wm_space_node(C); @@ -316,7 +316,7 @@ static bool WIDGETGROUP_node_crop_poll(const bContext *C, wmGizmoGroupType *UNUS return false; } -static void WIDGETGROUP_node_crop_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup) +static void WIDGETGROUP_node_crop_setup(const bContext * /*C*/, wmGizmoGroup *gzgroup) { NodeCropWidgetGroup *crop_group = MEM_new(__func__); crop_group->border = WM_gizmo_new("GIZMO_GT_cage_2d", gzgroup, nullptr); @@ -406,7 +406,7 @@ struct NodeSunBeamsWidgetGroup { } state; }; -static bool WIDGETGROUP_node_sbeam_poll(const bContext *C, wmGizmoGroupType *UNUSED(gzgt)) +static bool WIDGETGROUP_node_sbeam_poll(const bContext *C, wmGizmoGroupType * /*gzgt*/) { SpaceNode *snode = CTX_wm_space_node(C); @@ -425,7 +425,7 @@ static bool WIDGETGROUP_node_sbeam_poll(const bContext *C, wmGizmoGroupType *UNU return false; } -static void WIDGETGROUP_node_sbeam_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup) +static void WIDGETGROUP_node_sbeam_setup(const bContext * /*C*/, wmGizmoGroup *gzgroup) { NodeSunBeamsWidgetGroup *sbeam_group = (NodeSunBeamsWidgetGroup *)MEM_mallocN( sizeof(NodeSunBeamsWidgetGroup), __func__); @@ -511,7 +511,7 @@ struct NodeCornerPinWidgetGroup { } state; }; -static bool WIDGETGROUP_node_corner_pin_poll(const bContext *C, wmGizmoGroupType *UNUSED(gzgt)) +static bool WIDGETGROUP_node_corner_pin_poll(const bContext *C, wmGizmoGroupType * /*gzgt*/) { SpaceNode *snode = CTX_wm_space_node(C); @@ -530,7 +530,7 @@ static bool WIDGETGROUP_node_corner_pin_poll(const bContext *C, wmGizmoGroupType return false; } -static void WIDGETGROUP_node_corner_pin_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup) +static void WIDGETGROUP_node_corner_pin_setup(const bContext * /*C*/, wmGizmoGroup *gzgroup) { NodeCornerPinWidgetGroup *cpin_group = (NodeCornerPinWidgetGroup *)MEM_mallocN( sizeof(NodeCornerPinWidgetGroup), __func__); diff --git a/source/blender/editors/space_node/node_group.cc b/source/blender/editors/space_node/node_group.cc index e0de5e2f71d..7de02f5d6b8 100644 --- a/source/blender/editors/space_node/node_group.cc +++ b/source/blender/editors/space_node/node_group.cc @@ -603,9 +603,7 @@ static int node_group_separate_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int node_group_separate_invoke(bContext *C, - wmOperator *UNUSED(op), - const wmEvent *UNUSED(event)) +static int node_group_separate_invoke(bContext *C, wmOperator * /*op*/, const wmEvent * /*event*/) { uiPopupMenu *pup = UI_popup_menu_begin( C, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Separate"), ICON_NONE); diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc index d9f87433c53..7cf18e2f828 100644 --- a/source/blender/editors/space_node/node_relationships.cc +++ b/source/blender/editors/space_node/node_relationships.cc @@ -170,7 +170,7 @@ static void pick_input_link_by_link_intersect(const bContext &C, } } -static bool socket_is_available(bNodeTree *UNUSED(ntree), bNodeSocket *sock, const bool allow_used) +static bool socket_is_available(bNodeTree * /*ntree*/, bNodeSocket *sock, const bool allow_used) { if (nodeSocketIsHidden(sock)) { return false; @@ -699,7 +699,7 @@ static int node_link_viewer(const bContext &C, bNode &bnode_to_view, bNodeSocket /** \name Link to Viewer Node Operator * \{ */ -static int node_active_link_viewer_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_active_link_viewer_exec(bContext *C, wmOperator * /*op*/) { SpaceNode &snode = *CTX_wm_space_node(C); bNode *node = nodeGetActive(snode.edittree); @@ -805,7 +805,7 @@ static bool should_create_drag_link_search_menu(const bNodeTree &node_tree, return true; } -static void draw_draglink_tooltip(const bContext *UNUSED(C), ARegion *UNUSED(region), void *arg) +static void draw_draglink_tooltip(const bContext * /*C*/, ARegion * /*region*/, void *arg) { bNodeLinkDrag *nldrag = static_cast(arg); @@ -834,7 +834,7 @@ static void draw_draglink_tooltip_deactivate(const ARegion ®ion, bNodeLinkDra } } -static void node_link_update_header(bContext *C, bNodeLinkDrag *UNUSED(nldrag)) +static void node_link_update_header(bContext *C, bNodeLinkDrag * /*nldrag*/) { char header[UI_MAX_DRAW_STR]; @@ -1549,7 +1549,7 @@ void NODE_OT_links_mute(wmOperatorType *ot) /** \name Detach Links Operator * \{ */ -static int detach_links_exec(bContext *C, wmOperator *UNUSED(op)) +static int detach_links_exec(bContext *C, wmOperator * /*op*/) { SpaceNode &snode = *CTX_wm_space_node(C); bNodeTree &ntree = *snode.edittree; @@ -1586,7 +1586,7 @@ void NODE_OT_links_detach(wmOperatorType *ot) /** \name Set Parent Operator * \{ */ -static int node_parent_set_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_parent_set_exec(bContext *C, wmOperator * /*op*/) { SpaceNode &snode = *CTX_wm_space_node(C); bNodeTree &ntree = *snode.edittree; @@ -1668,7 +1668,7 @@ static void node_join_attach_recursive(bNode *node, } } -static int node_join_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_join_exec(bContext *C, wmOperator * /*op*/) { Main &bmain = *CTX_data_main(C); SpaceNode &snode = *CTX_wm_space_node(C); @@ -1738,7 +1738,7 @@ static bNode *node_find_frame_to_attach(ARegion ®ion, return nullptr; } -static int node_attach_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int node_attach_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { ARegion ®ion = *CTX_wm_region(C); SpaceNode &snode = *CTX_wm_space_node(C); @@ -1836,7 +1836,7 @@ static void node_detach_recursive(bNode *node) } /* detach the root nodes in the current selection */ -static int node_detach_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_detach_exec(bContext *C, wmOperator * /*op*/) { SpaceNode &snode = *CTX_wm_space_node(C); bNodeTree &ntree = *snode.edittree; @@ -2104,7 +2104,7 @@ static bNodeSocket *get_main_socket(bNodeTree &ntree, bNode &node, eNodeSocketIn return nullptr; } -static bool node_parents_offset_flag_enable_cb(bNode *parent, void *UNUSED(userdata)) +static bool node_parents_offset_flag_enable_cb(bNode *parent, void * /*userdata*/) { /* NODE_TEST is used to flag nodes that shouldn't be offset (again) */ parent->flag |= NODE_TEST; diff --git a/source/blender/editors/space_node/node_select.cc b/source/blender/editors/space_node/node_select.cc index c11ae323115..7c39169415b 100644 --- a/source/blender/editors/space_node/node_select.cc +++ b/source/blender/editors/space_node/node_select.cc @@ -1134,7 +1134,7 @@ void NODE_OT_select_all(wmOperatorType *ot) /** \name Select Linked To Operator * \{ */ -static int node_select_linked_to_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_select_linked_to_exec(bContext *C, wmOperator * /*op*/) { SpaceNode &snode = *CTX_wm_space_node(C); bNodeTree &node_tree = *snode.edittree; @@ -1184,7 +1184,7 @@ void NODE_OT_select_linked_to(wmOperatorType *ot) /** \name Select Linked From Operator * \{ */ -static int node_select_linked_from_exec(bContext *C, wmOperator *UNUSED(op)) +static int node_select_linked_from_exec(bContext *C, wmOperator * /*op*/) { SpaceNode &snode = *CTX_wm_space_node(C); bNodeTree &node_tree = *snode.edittree; @@ -1352,10 +1352,10 @@ static void node_find_create_label(const bNode *node, char *str, int maxlen) /* Generic search invoke. */ static void node_find_update_fn(const bContext *C, - void *UNUSED(arg), + void * /*arg*/, const char *str, uiSearchItems *items, - const bool UNUSED(is_first)) + const bool /*is_first*/) { SpaceNode *snode = CTX_wm_space_node(C); @@ -1383,7 +1383,7 @@ static void node_find_update_fn(const bContext *C, BLI_string_search_free(search); } -static void node_find_exec_fn(bContext *C, void *UNUSED(arg1), void *arg2) +static void node_find_exec_fn(bContext *C, void * /*arg1*/, void *arg2) { SpaceNode *snode = CTX_wm_space_node(C); bNode *active = (bNode *)arg2; @@ -1450,7 +1450,7 @@ static uiBlock *node_find_menu(bContext *C, ARegion *region, void *arg_op) return block; } -static int node_find_node_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int node_find_node_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { UI_popup_block_invoke(C, node_find_menu, op, nullptr); return OPERATOR_CANCELLED; diff --git a/source/blender/editors/space_node/node_templates.cc b/source/blender/editors/space_node/node_templates.cc index 5fc194e02a4..1b7eadd336a 100644 --- a/source/blender/editors/space_node/node_templates.cc +++ b/source/blender/editors/space_node/node_templates.cc @@ -494,7 +494,7 @@ static int ui_node_item_name_compare(const void *a, const void *b) return BLI_strcasecmp_natural(type_a->ui_name, type_b->ui_name); } -static bool ui_node_item_special_poll(const bNodeTree *UNUSED(ntree), const bNodeType *ntype) +static bool ui_node_item_special_poll(const bNodeTree * /*ntree*/, const bNodeType *ntype) { if (STREQ(ntype->idname, "ShaderNodeUVAlongStroke")) { /* TODO(sergey): Currently we don't have Freestyle nodes edited from diff --git a/source/blender/editors/space_node/node_view.cc b/source/blender/editors/space_node/node_view.cc index 2c02e3c6ecc..f9b019e12ea 100644 --- a/source/blender/editors/space_node/node_view.cc +++ b/source/blender/editors/space_node/node_view.cc @@ -273,7 +273,7 @@ static int snode_bg_viewmove_invoke(bContext *C, wmOperator *op, const wmEvent * return OPERATOR_RUNNING_MODAL; } -static void snode_bg_viewmove_cancel(bContext *UNUSED(C), wmOperator *op) +static void snode_bg_viewmove_cancel(bContext * /*C*/, wmOperator *op) { MEM_freeN(op->customdata); op->customdata = nullptr; @@ -341,7 +341,7 @@ void NODE_OT_backimage_zoom(wmOperatorType *ot) /** \name Background Image Fit * \{ */ -static int backimage_fit_exec(bContext *C, wmOperator *UNUSED(op)) +static int backimage_fit_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); SpaceNode *snode = CTX_wm_space_node(C); diff --git a/source/blender/editors/space_node/space_node.cc b/source/blender/editors/space_node/space_node.cc index 3e5cbf88e15..47d117ea81f 100644 --- a/source/blender/editors/space_node/space_node.cc +++ b/source/blender/editors/space_node/space_node.cc @@ -219,7 +219,7 @@ float2 space_node_group_offset(const SpaceNode &snode) /* ******************** default callbacks for node space ***************** */ -static SpaceLink *node_create(const ScrArea *UNUSED(area), const Scene *UNUSED(scene)) +static SpaceLink *node_create(const ScrArea * /*area*/, const Scene * /*scene*/) { SpaceNode *snode = MEM_cnew("initnode"); snode->spacetype = SPACE_NODE; @@ -305,7 +305,7 @@ static void node_free(SpaceLink *sl) } /* spacetype; init callback */ -static void node_init(wmWindowManager *UNUSED(wm), ScrArea *area) +static void node_init(wmWindowManager * /*wm*/, ScrArea *area) { SpaceNode *snode = (SpaceNode *)area->spacedata.first; @@ -640,24 +640,22 @@ static void node_main_region_draw(const bContext *C, ARegion *region) /* ************* dropboxes ************* */ -static bool node_group_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event)) +static bool node_group_drop_poll(bContext * /*C*/, wmDrag *drag, const wmEvent * /*event*/) { return WM_drag_is_ID_type(drag, ID_NT); } -static bool node_object_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event)) +static bool node_object_drop_poll(bContext * /*C*/, wmDrag *drag, const wmEvent * /*event*/) { return WM_drag_is_ID_type(drag, ID_OB); } -static bool node_collection_drop_poll(bContext *UNUSED(C), - wmDrag *drag, - const wmEvent *UNUSED(event)) +static bool node_collection_drop_poll(bContext * /*C*/, wmDrag *drag, const wmEvent * /*event*/) { return WM_drag_is_ID_type(drag, ID_GR); } -static bool node_ima_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event)) +static bool node_ima_drop_poll(bContext * /*C*/, wmDrag *drag, const wmEvent * /*event*/) { if (drag->type == WM_DRAG_PATH) { /* rule might not work? */ @@ -666,26 +664,26 @@ static bool node_ima_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent return WM_drag_is_ID_type(drag, ID_IM); } -static bool node_mask_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event)) +static bool node_mask_drop_poll(bContext * /*C*/, wmDrag *drag, const wmEvent * /*event*/) { return WM_drag_is_ID_type(drag, ID_MSK); } -static void node_group_drop_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void node_group_drop_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { ID *id = WM_drag_get_local_ID_or_import_from_asset(drag, 0); RNA_int_set(drop->ptr, "session_uuid", int(id->session_uuid)); } -static void node_id_drop_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void node_id_drop_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { ID *id = WM_drag_get_local_ID_or_import_from_asset(drag, 0); RNA_int_set(drop->ptr, "session_uuid", int(id->session_uuid)); } -static void node_id_path_drop_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void node_id_path_drop_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { ID *id = WM_drag_get_local_ID_or_import_from_asset(drag, 0); @@ -739,7 +737,7 @@ static void node_dropboxes() /* ************* end drop *********** */ /* add handlers, stuff you only do once or on area/region changes */ -static void node_header_region_init(wmWindowManager *UNUSED(wm), ARegion *region) +static void node_header_region_init(wmWindowManager * /*wm*/, ARegion *region) { ED_region_header_init(region); } @@ -979,7 +977,7 @@ static void node_id_remap_cb(ID *old_id, ID *new_id, void *user_data) } } -static void node_id_remap(ScrArea *UNUSED(area), SpaceLink *slink, const IDRemapper *mappings) +static void node_id_remap(ScrArea * /*area*/, SpaceLink *slink, const IDRemapper *mappings) { /* Although we should be able to perform all the mappings in a single go this lead to issues when * running the python test cases. Somehow the nodetree/edittree weren't updated to the new -- cgit v1.2.3