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*/` --- .../blender/blenkernel/BKE_image_partial_update.hh | 4 +- source/blender/blenkernel/intern/asset.cc | 2 +- .../blenkernel/intern/attribute_access_intern.hh | 2 +- source/blender/blenkernel/intern/brush.cc | 2 +- source/blender/blenkernel/intern/bvhutils.cc | 4 +- source/blender/blenkernel/intern/cryptomatte.cc | 4 +- .../blender/blenkernel/intern/cryptomatte_test.cc | 4 +- source/blender/blenkernel/intern/curve.cc | 2 +- source/blender/blenkernel/intern/curves.cc | 4 +- source/blender/blenkernel/intern/customdata.cc | 58 +++-- source/blender/blenkernel/intern/editmesh.cc | 2 +- .../blender/blenkernel/intern/editmesh_tangent.cc | 2 +- .../blenkernel/intern/geometry_component_curves.cc | 4 +- .../intern/geometry_component_instances.cc | 10 +- .../blenkernel/intern/geometry_component_mesh.cc | 8 +- .../intern/geometry_component_pointcloud.cc | 4 +- .../blender/blenkernel/intern/geometry_fields.cc | 2 +- .../blender/blenkernel/intern/idprop_serialize.cc | 4 +- source/blender/blenkernel/intern/image.cc | 22 +- .../blender/blenkernel/intern/lib_id_remapper.cc | 2 +- source/blender/blenkernel/intern/lib_override.cc | 6 +- source/blender/blenkernel/intern/mball.cc | 5 +- source/blender/blenkernel/intern/mesh_convert.cc | 6 +- source/blender/blenkernel/intern/mesh_evaluate.cc | 2 +- source/blender/blenkernel/intern/mesh_fair.cc | 2 +- source/blender/blenkernel/intern/mesh_mapping.cc | 24 +-- source/blender/blenkernel/intern/mesh_normals.cc | 19 +- source/blender/blenkernel/intern/mesh_runtime.cc | 2 +- source/blender/blenkernel/intern/mesh_tangent.cc | 6 +- .../blender/blenkernel/intern/mesh_tessellate.cc | 4 +- source/blender/blenkernel/intern/mesh_validate.cc | 6 +- source/blender/blenkernel/intern/modifier.cc | 10 +- source/blender/blenkernel/intern/node.cc | 32 +-- .../blender/blenkernel/intern/node_tree_update.cc | 6 +- source/blender/blenkernel/intern/object.cc | 20 +- source/blender/blenkernel/intern/object_update.cc | 2 +- source/blender/blenkernel/intern/paint.cc | 13 +- source/blender/blenkernel/intern/pbvh_pixels.cc | 2 +- source/blender/blenkernel/intern/pointcloud.cc | 4 +- source/blender/blenkernel/intern/scene.cc | 6 +- source/blender/blenkernel/intern/simulation.cc | 6 +- source/blender/blenkernel/intern/subdiv_mesh.cc | 36 ++-- source/blender/blenkernel/intern/volume.cc | 7 +- source/blender/blenlib/BLI_allocator.hh | 2 +- .../blender/blenlib/BLI_generic_virtual_array.hh | 2 +- .../blenlib/BLI_generic_virtual_vector_array.hh | 4 +- source/blender/blenlib/BLI_map.hh | 2 +- source/blender/blenlib/BLI_map_slots.hh | 8 +- source/blender/blenlib/BLI_set_slots.hh | 10 +- source/blender/blenlib/BLI_vector_set_slots.hh | 4 +- source/blender/blenlib/BLI_virtual_array.hh | 8 +- source/blender/blenlib/intern/delaunay_2d.cc | 4 +- .../blenlib/intern/generic_virtual_array.cc | 12 +- .../blenlib/intern/generic_virtual_vector_array.cc | 8 +- source/blender/blenlib/intern/mesh_boolean.cc | 2 +- source/blender/blenlib/intern/mesh_intersect.cc | 14 +- source/blender/blenlib/intern/task_graph.cc | 2 +- source/blender/blenlib/intern/task_range.cc | 2 +- source/blender/blenlib/tests/BLI_cpp_type_test.cc | 2 +- .../blender/blenlib/tests/BLI_delaunay_2d_test.cc | 2 +- source/blender/blenlib/tests/BLI_map_test.cc | 4 +- .../blender/blenlib/tests/BLI_memory_utils_test.cc | 2 +- .../blender/blenlib/tests/BLI_mesh_boolean_test.cc | 2 +- source/blender/blenlib/tests/BLI_task_test.cc | 13 +- source/blender/blenlib/tests/BLI_vector_test.cc | 4 +- .../tests/performance/BLI_task_performance_test.cc | 12 +- source/blender/blenloader/intern/readfile.cc | 21 +- source/blender/blenloader/intern/versioning_300.cc | 20 +- source/blender/blenloader/intern/writefile.cc | 2 +- source/blender/bmesh/intern/bmesh_mesh.cc | 2 +- source/blender/bmesh/tools/bmesh_boolean.cc | 32 +-- source/blender/compositor/intern/COM_MetaData.cc | 2 +- .../compositor/intern/COM_MultiThreadedOperation.h | 12 +- .../blender/compositor/intern/COM_NodeOperation.h | 6 +- .../blender/compositor/intern/COM_WorkScheduler.cc | 2 +- .../compositor/nodes/COM_CombineColorNode.cc | 2 +- .../blender/compositor/nodes/COM_CombineXYZNode.cc | 2 +- .../compositor/nodes/COM_ConvertColorSpaceNode.cc | 2 +- .../compositor/nodes/COM_CryptomatteNode.cc | 4 +- .../compositor/nodes/COM_SeparateColorNode.cc | 2 +- .../compositor/nodes/COM_SeparateXYZNode.cc | 2 +- .../operations/COM_BilateralBlurOperation.cc | 2 +- .../operations/COM_BokehImageOperation.cc | 2 +- .../operations/COM_CalculateMeanOperation.cc | 8 +- .../COM_CalculateStandardDeviationOperation.cc | 7 +- .../operations/COM_CompositorOperation.cc | 4 +- .../compositor/operations/COM_ConstantOperation.cc | 2 +- .../compositor/operations/COM_DenoiseOperation.cc | 14 +- .../operations/COM_DirectionalBlurOperation.cc | 2 +- .../compositor/operations/COM_DisplaceOperation.cc | 4 +- .../operations/COM_DoubleEdgeMaskOperation.cc | 6 +- .../operations/COM_FastGaussianBlurOperation.cc | 8 +- .../operations/COM_FastGaussianBlurOperation.h | 6 +- .../operations/COM_GlareBaseOperation.cc | 4 +- .../compositor/operations/COM_ImageOperation.cc | 8 +- .../compositor/operations/COM_InpaintOperation.cc | 2 +- .../operations/COM_KeyingBlurOperation.cc | 2 +- .../compositor/operations/COM_MapUVOperation.cc | 4 +- .../compositor/operations/COM_MaskOperation.cc | 2 +- .../operations/COM_MovieClipOperation.cc | 6 +- .../operations/COM_MultilayerImageOperation.cc | 2 +- .../operations/COM_NormalizeOperation.cc | 8 +- .../operations/COM_OutputFileOperation.cc | 4 +- .../operations/COM_PlaneCornerPinOperation.cc | 4 +- .../operations/COM_PlaneDistortCommonOperation.cc | 2 +- .../compositor/operations/COM_PreviewOperation.cc | 4 +- .../compositor/operations/COM_RenderLayersProg.cc | 10 +- .../compositor/operations/COM_SMAAOperation.cc | 10 +- .../compositor/operations/COM_ScaleOperation.h | 4 +- .../COM_ScreenLensDistortionOperation.cc | 2 +- .../compositor/operations/COM_TonemapOperation.cc | 6 +- .../operations/COM_VectorBlurOperation.cc | 4 +- .../compositor/operations/COM_ViewerOperation.cc | 2 +- .../realtime_compositor/intern/utilities.cc | 4 +- .../compositor/tests/COM_BuffersIterator_test.cc | 8 +- .../depsgraph/intern/depsgraph_query_foreach.cc | 2 +- .../depsgraph/intern/depsgraph_query_iter.cc | 2 +- source/blender/depsgraph/intern/eval/deg_eval.cc | 2 +- .../intern/eval/deg_eval_runtime_backup_gpencil.cc | 2 +- .../blender/depsgraph/intern/node/deg_node_id.cc | 2 +- .../draw/engines/compositor/compositor_engine.cc | 2 +- .../draw/engines/eevee_next/eevee_engine.cc | 2 +- .../draw/engines/eevee_next/eevee_pipeline.cc | 2 +- .../blender/draw/engines/eevee_next/eevee_sync.cc | 4 +- .../draw/engines/eevee_next/eevee_velocity.cc | 4 +- source/blender/draw/engines/image/image_engine.cc | 2 +- .../draw/engines/image/image_space_image.hh | 6 +- .../draw/engines/overlay/overlay_armature.cc | 2 +- .../blender/draw/engines/overlay/overlay_facing.cc | 2 +- .../blender/draw/engines/overlay/overlay_fade.cc | 2 +- .../draw/engines/overlay/overlay_gpencil.cc | 4 +- .../draw/engines/overlay/overlay_outline.cc | 8 +- .../draw/engines/workbench/workbench_shader.cc | 4 +- source/blender/draw/intern/draw_cache_impl_mesh.cc | 5 +- .../draw/intern/draw_cache_impl_pointcloud.cc | 2 +- .../draw/intern/draw_cache_impl_subdivision.cc | 44 ++-- source/blender/draw/intern/draw_hair.cc | 4 +- source/blender/draw/intern/draw_manager_data.cc | 2 +- source/blender/draw/intern/draw_shader.cc | 7 +- .../mesh_extractors/extract_mesh_ibo_edituv.cc | 86 ++++---- .../mesh_extractors/extract_mesh_ibo_fdots.cc | 10 +- .../mesh_extractors/extract_mesh_ibo_lines.cc | 34 +-- .../extract_mesh_ibo_lines_adjacency.cc | 26 +-- .../extract_mesh_ibo_lines_paint_mask.cc | 23 +- .../mesh_extractors/extract_mesh_ibo_points.cc | 32 +-- .../mesh_extractors/extract_mesh_ibo_tris.cc | 14 +- .../mesh_extractors/extract_mesh_vbo_attributes.cc | 8 +- .../mesh_extractors/extract_mesh_vbo_edge_fac.cc | 18 +- .../mesh_extractors/extract_mesh_vbo_edit_data.cc | 12 +- .../extract_mesh_vbo_edituv_data.cc | 6 +- .../extract_mesh_vbo_edituv_stretch_angle.cc | 8 +- .../extract_mesh_vbo_edituv_stretch_area.cc | 8 +- .../extract_mesh_vbo_fdots_edituv_data.cc | 6 +- .../mesh_extractors/extract_mesh_vbo_fdots_nor.cc | 16 +- .../mesh_extractors/extract_mesh_vbo_fdots_pos.cc | 6 +- .../mesh_extractors/extract_mesh_vbo_fdots_uv.cc | 6 +- .../mesh_extractors/extract_mesh_vbo_lnor.cc | 12 +- .../extract_mesh_vbo_mesh_analysis.cc | 14 +- .../mesh_extractors/extract_mesh_vbo_orco.cc | 8 +- .../mesh_extractors/extract_mesh_vbo_pos_nor.cc | 30 +-- .../extract_mesh_vbo_sculpt_data.cc | 8 +- .../mesh_extractors/extract_mesh_vbo_select_idx.cc | 48 ++--- .../mesh_extractors/extract_mesh_vbo_skin_roots.cc | 4 +- .../intern/mesh_extractors/extract_mesh_vbo_tan.cc | 6 +- .../intern/mesh_extractors/extract_mesh_vbo_uv.cc | 6 +- .../mesh_extractors/extract_mesh_vbo_weights.cc | 6 +- .../blender/editors/animation/keyframes_keylist.cc | 4 +- source/blender/editors/asset/intern/asset_ops.cc | 12 +- source/blender/editors/curves/intern/curves_ops.cc | 4 +- .../editors/geometry/geometry_attributes.cc | 10 +- .../editors/gpencil/gpencil_bake_animation.cc | 6 +- source/blender/editors/gpencil/gpencil_mesh.cc | 6 +- source/blender/editors/interface/interface.cc | 12 +- source/blender/editors/interface/interface_anim.cc | 2 +- .../editors/interface/interface_dropboxes.cc | 15 +- source/blender/editors/interface/interface_ops.cc | 38 ++-- .../blender/editors/interface/interface_panel.cc | 4 +- .../blender/editors/interface/interface_query.cc | 6 +- .../interface/interface_region_color_picker.cc | 12 +- .../editors/interface/interface_region_hud.cc | 2 +- .../editors/interface/interface_region_menu_pie.cc | 2 +- .../editors/interface/interface_region_popover.cc | 2 +- .../editors/interface/interface_region_search.cc | 8 +- .../editors/interface/interface_region_tooltip.cc | 2 +- .../interface/interface_template_asset_view.cc | 14 +- .../editors/interface/interface_template_list.cc | 20 +- .../interface/interface_template_search_menu.cc | 8 +- .../interface_template_search_operator.cc | 6 +- source/blender/editors/interface/view2d_draw.cc | 4 +- .../editors/interface/view2d_gizmo_navigate.cc | 4 +- source/blender/editors/interface/view2d_ops.cc | 10 +- .../editors/interface/views/abstract_view_item.cc | 2 +- source/blender/editors/mesh/editmesh_select.cc | 14 +- source/blender/editors/mesh/mesh_data.cc | 32 +-- source/blender/editors/mesh/meshtools.cc | 2 +- source/blender/editors/object/object_add.cc | 8 +- source/blender/editors/object/object_modifier.cc | 54 +++-- source/blender/editors/object/object_remesh.cc | 2 +- source/blender/editors/object/object_transform.cc | 8 +- source/blender/editors/object/object_vgroup.cc | 38 ++-- source/blender/editors/render/render_internal.cc | 2 +- source/blender/editors/render/render_opengl.cc | 4 +- source/blender/editors/render/render_preview.cc | 13 +- source/blender/editors/render/render_shading.cc | 56 ++--- source/blender/editors/render/render_update.cc | 6 +- source/blender/editors/render/render_view.cc | 2 +- .../editors/sculpt_paint/curves_sculpt_add.cc | 4 +- .../editors/sculpt_paint/curves_sculpt_density.cc | 8 +- .../editors/sculpt_paint/curves_sculpt_ops.cc | 8 +- source/blender/editors/sculpt_paint/paint_image.cc | 4 +- .../editors/sculpt_paint/paint_image_ops_paint.cc | 14 +- .../blender/editors/sculpt_paint/paint_vertex.cc | 33 +-- .../editors/sculpt_paint/paint_vertex_color_ops.cc | 6 +- .../editors/sculpt_paint/sculpt_face_set.cc | 2 +- .../editors/sculpt_paint/sculpt_paint_image.cc | 4 +- .../editors/space_file/asset_catalog_tree_view.cc | 2 +- source/blender/editors/space_file/file_indexer.cc | 14 +- source/blender/editors/space_file/filelist.cc | 22 +- source/blender/editors/space_image/image_undo.cc | 8 +- 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 ++- .../editors/space_outliner/outliner_collections.cc | 6 +- .../editors/space_outliner/outliner_dragdrop.cc | 18 +- .../editors/space_outliner/outliner_draw.cc | 12 +- .../editors/space_outliner/outliner_edit.cc | 54 ++--- .../editors/space_outliner/outliner_select.cc | 4 +- .../editors/space_outliner/outliner_tools.cc | 240 ++++++++++----------- .../editors/space_outliner/space_outliner.cc | 12 +- .../space_outliner/tree/tree_element_rna.cc | 2 +- .../editors/space_spreadsheet/space_spreadsheet.cc | 22 +- .../editors/space_spreadsheet/spreadsheet_draw.cc | 16 +- .../space_spreadsheet/spreadsheet_layout.cc | 2 +- .../editors/space_spreadsheet/spreadsheet_ops.cc | 6 +- .../space_spreadsheet/spreadsheet_row_filter_ui.cc | 6 +- .../blender/editors/space_view3d/space_view3d.cc | 38 ++-- source/blender/editors/space_view3d/view3d_draw.cc | 4 +- .../space_view3d/view3d_gizmo_preselect_type.cc | 12 +- .../blender/editors/space_view3d/view3d_select.cc | 28 +-- .../editors/transform/transform_snap_object.cc | 8 +- source/blender/editors/util/ed_util_ops.cc | 8 +- .../intern/blender_interface/FRS_freestyle.cpp | 2 +- .../intern/python/BPy_BinaryPredicate0D.cpp | 2 +- .../intern/python/BPy_BinaryPredicate1D.cpp | 2 +- .../freestyle/intern/python/BPy_FrsMaterial.cpp | 28 +-- source/blender/freestyle/intern/python/BPy_Id.cpp | 8 +- .../freestyle/intern/python/BPy_Interface0D.cpp | 16 +- .../freestyle/intern/python/BPy_Interface1D.cpp | 14 +- .../freestyle/intern/python/BPy_Iterator.cpp | 6 +- .../blender/freestyle/intern/python/BPy_SShape.cpp | 16 +- .../intern/python/BPy_StrokeAttribute.cpp | 16 +- .../freestyle/intern/python/BPy_StrokeShader.cpp | 2 +- .../intern/python/BPy_UnaryFunction0D.cpp | 2 +- .../intern/python/BPy_UnaryFunction1D.cpp | 2 +- .../intern/python/BPy_UnaryPredicate0D.cpp | 2 +- .../intern/python/BPy_UnaryPredicate1D.cpp | 2 +- .../freestyle/intern/python/BPy_ViewMap.cpp | 4 +- .../freestyle/intern/python/BPy_ViewShape.cpp | 18 +- .../intern/python/Interface0D/BPy_CurvePoint.cpp | 18 +- .../intern/python/Interface0D/BPy_SVertex.cpp | 20 +- .../intern/python/Interface0D/BPy_ViewVertex.cpp | 4 +- .../Interface0D/CurvePoint/BPy_StrokeVertex.cpp | 21 +- .../Interface0D/ViewVertex/BPy_NonTVertex.cpp | 4 +- .../python/Interface0D/ViewVertex/BPy_TVertex.cpp | 12 +- .../intern/python/Interface1D/BPy_FEdge.cpp | 32 +-- .../intern/python/Interface1D/BPy_FrsCurve.cpp | 4 +- .../intern/python/Interface1D/BPy_Stroke.cpp | 20 +- .../intern/python/Interface1D/BPy_ViewEdge.cpp | 44 ++-- .../python/Interface1D/FEdge/BPy_FEdgeSharp.cpp | 32 ++- .../python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp | 14 +- .../python/Iterator/BPy_AdjacencyIterator.cpp | 5 +- .../python/Iterator/BPy_ChainingIterator.cpp | 7 +- .../python/Iterator/BPy_CurvePointIterator.cpp | 6 +- .../python/Iterator/BPy_Interface0DIterator.cpp | 10 +- .../intern/python/Iterator/BPy_SVertexIterator.cpp | 6 +- .../python/Iterator/BPy_StrokeVertexIterator.cpp | 6 +- .../python/Iterator/BPy_ViewEdgeIterator.cpp | 16 +- .../Iterator/BPy_orientedViewEdgeIterator.cpp | 2 +- .../UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp | 4 +- .../BPy_UnaryFunction1DEdgeNature.cpp | 4 +- .../UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp | 4 +- .../BPy_UnaryFunction1DUnsigned.cpp | 4 +- .../UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp | 4 +- .../UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp | 4 +- .../BPy_UnaryFunction1DVectorViewShape.cpp | 5 +- .../UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp | 6 +- .../intern/scene_graph/ScenePrettyPrinter.cpp | 16 +- .../freestyle/intern/view_map/Interface0D.cpp | 2 +- .../intern/view_map/ViewMapTesselator.cpp | 2 +- .../freestyle/intern/winged_edge/Curvature.cpp | 2 +- .../intern/winged_edge/WingedEdgeBuilder.cpp | 2 +- source/blender/functions/FN_field.hh | 2 +- source/blender/functions/FN_multi_function.hh | 2 +- .../blender/functions/FN_multi_function_builder.hh | 6 +- source/blender/functions/intern/field.cc | 6 +- source/blender/functions/intern/lazy_function.cc | 2 +- .../functions/intern/multi_function_builder.cc | 10 +- .../functions/intern/multi_function_procedure.cc | 4 +- source/blender/functions/tests/FN_field_test.cc | 6 +- .../functions/tests/FN_lazy_function_test.cc | 6 +- .../functions/tests/FN_multi_function_test.cc | 2 +- .../tests/FN_multi_function_test_common.hh | 14 +- source/blender/geometry/intern/mesh_to_volume.cc | 4 +- source/blender/gpu/intern/gpu_framebuffer.cc | 2 +- .../blender/gpu/intern/gpu_shader_builder_stubs.cc | 134 ++++++------ source/blender/gpu/intern/gpu_texture.cc | 2 +- source/blender/gpu/intern/gpu_vertex_format.cc | 2 +- source/blender/gpu/opengl/gl_debug.cc | 8 +- .../blender/imbuf/intern/openexr/openexr_api.cpp | 4 +- source/blender/imbuf/intern/transform.cc | 7 +- .../blender/io/alembic/intern/abc_reader_object.cc | 10 +- .../io/alembic/intern/abc_reader_transform.cc | 2 +- .../io/gpencil/intern/gpencil_io_export_pdf.cc | 2 +- .../io/usd/intern/usd_hierarchy_iterator.cc | 2 +- source/blender/io/usd/intern/usd_writer_hair.cc | 2 +- source/blender/makesrna/intern/rna_path.cc | 4 +- source/blender/modifiers/intern/MOD_boolean.cc | 12 +- .../blender/modifiers/intern/MOD_datatransfer.cc | 32 ++- source/blender/modifiers/intern/MOD_mask.cc | 10 +- .../blender/modifiers/intern/MOD_mesh_to_volume.cc | 2 +- .../modifiers/intern/MOD_meshsequencecache.cc | 10 +- source/blender/modifiers/intern/MOD_nodes.cc | 12 +- source/blender/modifiers/intern/MOD_normal_edit.cc | 16 +- .../blender/modifiers/intern/MOD_particlesystem.cc | 2 +- source/blender/modifiers/intern/MOD_subsurf.cc | 2 +- .../modifiers/intern/MOD_volume_displace.cc | 2 +- .../blender/modifiers/intern/MOD_volume_to_mesh.cc | 2 +- source/blender/modifiers/intern/MOD_wave.cc | 8 +- source/blender/modifiers/intern/MOD_weld.cc | 4 +- .../blender/nodes/composite/node_composite_tree.cc | 15 +- .../blender/nodes/composite/node_composite_util.cc | 6 +- .../composite/nodes/node_composite_alpha_over.cc | 4 +- .../composite/nodes/node_composite_antialiasing.cc | 4 +- .../nodes/node_composite_bilateralblur.cc | 6 +- .../nodes/composite/nodes/node_composite_blur.cc | 4 +- .../composite/nodes/node_composite_bokehblur.cc | 4 +- .../composite/nodes/node_composite_bokehimage.cc | 4 +- .../composite/nodes/node_composite_boxmask.cc | 4 +- .../composite/nodes/node_composite_brightness.cc | 6 +- .../nodes/node_composite_channel_matte.cc | 6 +- .../composite/nodes/node_composite_chroma_matte.cc | 4 +- .../composite/nodes/node_composite_color_matte.cc | 4 +- .../composite/nodes/node_composite_color_spill.cc | 4 +- .../composite/nodes/node_composite_colorbalance.cc | 12 +- .../nodes/node_composite_colorcorrection.cc | 8 +- .../composite/nodes/node_composite_composite.cc | 2 +- .../nodes/node_composite_convert_color_space.cc | 4 +- .../nodes/composite/nodes/node_composite_crop.cc | 4 +- .../composite/nodes/node_composite_cryptomatte.cc | 6 +- .../nodes/composite/nodes/node_composite_curves.cc | 8 +- .../composite/nodes/node_composite_defocus.cc | 2 +- .../composite/nodes/node_composite_denoise.cc | 4 +- .../composite/nodes/node_composite_despeckle.cc | 4 +- .../composite/nodes/node_composite_diff_matte.cc | 4 +- .../nodes/composite/nodes/node_composite_dilate.cc | 4 +- .../nodes/node_composite_directionalblur.cc | 4 +- .../nodes/node_composite_distance_matte.cc | 6 +- .../nodes/node_composite_double_edge_mask.cc | 2 +- .../composite/nodes/node_composite_ellipsemask.cc | 4 +- .../nodes/composite/nodes/node_composite_filter.cc | 2 +- .../nodes/composite/nodes/node_composite_flip.cc | 2 +- .../nodes/composite/nodes/node_composite_glare.cc | 4 +- .../composite/nodes/node_composite_huecorrect.cc | 2 +- .../composite/nodes/node_composite_id_mask.cc | 2 +- .../nodes/composite/nodes/node_composite_image.cc | 12 +- .../composite/nodes/node_composite_inpaint.cc | 2 +- .../nodes/composite/nodes/node_composite_invert.cc | 4 +- .../nodes/composite/nodes/node_composite_keying.cc | 4 +- .../composite/nodes/node_composite_lensdist.cc | 4 +- .../nodes/composite/nodes/node_composite_levels.cc | 4 +- .../composite/nodes/node_composite_luma_matte.cc | 4 +- .../composite/nodes/node_composite_map_range.cc | 2 +- .../nodes/composite/nodes/node_composite_map_uv.cc | 2 +- .../composite/nodes/node_composite_map_value.cc | 4 +- .../nodes/composite/nodes/node_composite_mask.cc | 4 +- .../nodes/node_composite_moviedistortion.cc | 4 +- .../composite/nodes/node_composite_output_file.cc | 6 +- .../composite/nodes/node_composite_premulkey.cc | 2 +- .../nodes/composite/nodes/node_composite_rotate.cc | 4 +- .../nodes/composite/nodes/node_composite_scale.cc | 2 +- .../nodes/node_composite_sepcomb_color.cc | 6 +- .../composite/nodes/node_composite_sepcomb_ycca.cc | 4 +- .../composite/nodes/node_composite_setalpha.cc | 4 +- .../composite/nodes/node_composite_split_viewer.cc | 4 +- .../composite/nodes/node_composite_sunbeams.cc | 4 +- .../nodes/composite/nodes/node_composite_switch.cc | 2 +- .../composite/nodes/node_composite_switchview.cc | 4 +- .../composite/nodes/node_composite_tonemap.cc | 4 +- .../composite/nodes/node_composite_transform.cc | 2 +- .../composite/nodes/node_composite_translate.cc | 4 +- .../composite/nodes/node_composite_val_to_rgb.cc | 2 +- .../composite/nodes/node_composite_vec_blur.cc | 4 +- .../nodes/composite/nodes/node_composite_viewer.cc | 6 +- .../composite/nodes/node_composite_zcombine.cc | 2 +- .../blender/nodes/function/node_function_util.cc | 2 +- .../nodes/node_fn_align_euler_to_vector.cc | 4 +- .../nodes/function/nodes/node_fn_boolean_math.cc | 4 +- .../nodes/function/nodes/node_fn_combine_color.cc | 6 +- .../nodes/function/nodes/node_fn_compare.cc | 6 +- .../nodes/function/nodes/node_fn_float_to_int.cc | 4 +- .../nodes/function/nodes/node_fn_input_bool.cc | 4 +- .../nodes/function/nodes/node_fn_input_color.cc | 4 +- .../nodes/function/nodes/node_fn_input_int.cc | 4 +- .../nodes/node_fn_input_special_characters.cc | 2 +- .../nodes/function/nodes/node_fn_input_string.cc | 8 +- .../nodes/function/nodes/node_fn_input_vector.cc | 4 +- .../nodes/function/nodes/node_fn_random_value.cc | 4 +- .../nodes/function/nodes/node_fn_rotate_euler.cc | 2 +- .../nodes/function/nodes/node_fn_separate_color.cc | 12 +- .../blender/nodes/geometry/node_geometry_tree.cc | 11 +- .../blender/nodes/geometry/node_geometry_util.cc | 4 +- .../geometry/nodes/node_geo_accumulate_field.cc | 4 +- .../geometry/nodes/node_geo_attribute_capture.cc | 4 +- .../nodes/node_geo_attribute_domain_size.cc | 4 +- .../geometry/nodes/node_geo_attribute_statistic.cc | 4 +- .../nodes/geometry/nodes/node_geo_boolean.cc | 4 +- .../geometry/nodes/node_geo_collection_info.cc | 4 +- .../nodes/node_geo_curve_endpoint_selection.cc | 2 +- .../nodes/geometry/nodes/node_geo_curve_fill.cc | 4 +- .../nodes/geometry/nodes/node_geo_curve_fillet.cc | 4 +- .../nodes/node_geo_curve_handle_type_selection.cc | 4 +- .../geometry/nodes/node_geo_curve_primitive_arc.cc | 4 +- .../node_geo_curve_primitive_bezier_segment.cc | 4 +- .../nodes/node_geo_curve_primitive_circle.cc | 4 +- .../nodes/node_geo_curve_primitive_line.cc | 4 +- .../node_geo_curve_primitive_quadrilateral.cc | 4 +- .../geometry/nodes/node_geo_curve_resample.cc | 4 +- .../nodes/geometry/nodes/node_geo_curve_sample.cc | 8 +- .../nodes/node_geo_curve_set_handle_type.cc | 4 +- .../nodes/node_geo_curve_spline_parameter.cc | 6 +- .../geometry/nodes/node_geo_curve_spline_type.cc | 4 +- .../geometry/nodes/node_geo_curve_to_points.cc | 4 +- .../nodes/geometry/nodes/node_geo_curve_trim.cc | 4 +- .../geometry/nodes/node_geo_delete_geometry.cc | 4 +- .../nodes/node_geo_distribute_points_in_volume.cc | 4 +- .../nodes/node_geo_distribute_points_on_faces.cc | 4 +- .../geometry/nodes/node_geo_duplicate_elements.cc | 4 +- .../nodes/geometry/nodes/node_geo_extrude_mesh.cc | 4 +- .../geometry/nodes/node_geo_field_at_index.cc | 4 +- .../nodes/geometry/nodes/node_geo_image_texture.cc | 6 +- .../nodes/node_geo_input_instance_rotation.cc | 2 +- .../nodes/node_geo_input_instance_scale.cc | 2 +- .../geometry/nodes/node_geo_input_material.cc | 2 +- .../nodes/node_geo_input_mesh_edge_angle.cc | 4 +- .../nodes/node_geo_input_mesh_edge_neighbors.cc | 2 +- .../nodes/node_geo_input_mesh_edge_vertices.cc | 2 +- .../nodes/node_geo_input_mesh_face_area.cc | 2 +- .../nodes/node_geo_input_mesh_face_neighbors.cc | 4 +- .../geometry/nodes/node_geo_input_mesh_island.cc | 4 +- .../nodes/node_geo_input_mesh_vertex_neighbors.cc | 4 +- .../nodes/node_geo_input_named_attribute.cc | 4 +- .../geometry/nodes/node_geo_input_spline_length.cc | 2 +- .../nodes/geometry/nodes/node_geo_input_tangent.cc | 2 +- .../geometry/nodes/node_geo_interpolate_domain.cc | 4 +- .../nodes/geometry/nodes/node_geo_join_geometry.cc | 5 +- .../geometry/nodes/node_geo_merge_by_distance.cc | 4 +- .../nodes/node_geo_mesh_primitive_circle.cc | 4 +- .../geometry/nodes/node_geo_mesh_primitive_cone.cc | 4 +- .../nodes/node_geo_mesh_primitive_cylinder.cc | 4 +- .../geometry/nodes/node_geo_mesh_primitive_line.cc | 4 +- .../geometry/nodes/node_geo_mesh_to_points.cc | 4 +- .../geometry/nodes/node_geo_mesh_to_volume.cc | 4 +- .../nodes/geometry/nodes/node_geo_object_info.cc | 4 +- .../nodes/geometry/nodes/node_geo_points.cc | 2 +- .../geometry/nodes/node_geo_points_to_volume.cc | 4 +- .../nodes/geometry/nodes/node_geo_proximity.cc | 6 +- .../nodes/geometry/nodes/node_geo_raycast.cc | 6 +- .../geometry/nodes/node_geo_realize_instances.cc | 2 +- .../nodes/geometry/nodes/node_geo_sample_index.cc | 6 +- .../geometry/nodes/node_geo_sample_nearest.cc | 6 +- .../nodes/node_geo_sample_nearest_surface.cc | 6 +- .../geometry/nodes/node_geo_sample_uv_surface.cc | 6 +- .../geometry/nodes/node_geo_scale_elements.cc | 4 +- .../geometry/nodes/node_geo_separate_geometry.cc | 4 +- .../geometry/nodes/node_geo_set_curve_handles.cc | 4 +- .../geometry/nodes/node_geo_set_curve_normal.cc | 4 +- .../nodes/node_geo_store_named_attribute.cc | 4 +- .../geometry/nodes/node_geo_string_to_curves.cc | 2 +- .../geometry/nodes/node_geo_subdivision_surface.cc | 4 +- .../nodes/geometry/nodes/node_geo_switch.cc | 4 +- .../nodes/geometry/nodes/node_geo_triangulate.cc | 4 +- .../geometry/nodes/node_geo_uv_pack_islands.cc | 2 +- .../nodes/geometry/nodes/node_geo_uv_unwrap.cc | 6 +- .../nodes/geometry/nodes/node_geo_viewer.cc | 6 +- .../nodes/geometry/nodes/node_geo_volume_cube.cc | 4 +- .../geometry/nodes/node_geo_volume_to_mesh.cc | 4 +- .../nodes/intern/geometry_nodes_lazy_function.cc | 16 +- source/blender/nodes/intern/geometry_nodes_log.cc | 2 +- source/blender/nodes/intern/node_common.cc | 4 +- source/blender/nodes/intern/node_socket.cc | 18 +- .../nodes/intern/node_socket_declarations.cc | 2 +- source/blender/nodes/shader/node_shader_tree.cc | 21 +- source/blender/nodes/shader/node_shader_util.cc | 8 +- .../nodes/shader/nodes/node_shader_add_shader.cc | 2 +- .../shader/nodes/node_shader_ambient_occlusion.cc | 8 +- .../nodes/shader/nodes/node_shader_attribute.cc | 6 +- .../nodes/shader/nodes/node_shader_background.cc | 2 +- .../nodes/shader/nodes/node_shader_bevel.cc | 6 +- .../nodes/shader/nodes/node_shader_blackbody.cc | 2 +- .../nodes/shader/nodes/node_shader_brightness.cc | 2 +- .../shader/nodes/node_shader_bsdf_anisotropic.cc | 6 +- .../nodes/shader/nodes/node_shader_bsdf_diffuse.cc | 2 +- .../nodes/shader/nodes/node_shader_bsdf_glass.cc | 4 +- .../nodes/shader/nodes/node_shader_bsdf_glossy.cc | 4 +- .../nodes/shader/nodes/node_shader_bsdf_hair.cc | 4 +- .../nodes/node_shader_bsdf_hair_principled.cc | 8 +- .../shader/nodes/node_shader_bsdf_principled.cc | 6 +- .../shader/nodes/node_shader_bsdf_refraction.cc | 4 +- .../nodes/shader/nodes/node_shader_bsdf_toon.cc | 4 +- .../shader/nodes/node_shader_bsdf_translucent.cc | 2 +- .../shader/nodes/node_shader_bsdf_transparent.cc | 2 +- .../nodes/shader/nodes/node_shader_bsdf_velvet.cc | 2 +- .../blender/nodes/shader/nodes/node_shader_bump.cc | 4 +- .../nodes/shader/nodes/node_shader_camera.cc | 2 +- .../nodes/shader/nodes/node_shader_clamp.cc | 6 +- .../nodes/shader/nodes/node_shader_color_ramp.cc | 6 +- .../nodes/shader/nodes/node_shader_curves.cc | 18 +- .../nodes/shader/nodes/node_shader_displacement.cc | 4 +- .../shader/nodes/node_shader_eevee_specular.cc | 2 +- .../nodes/shader/nodes/node_shader_emission.cc | 2 +- .../nodes/shader/nodes/node_shader_fresnel.cc | 2 +- .../nodes/shader/nodes/node_shader_gamma.cc | 2 +- .../nodes/shader/nodes/node_shader_geometry.cc | 2 +- .../nodes/shader/nodes/node_shader_hair_info.cc | 2 +- .../nodes/shader/nodes/node_shader_holdout.cc | 2 +- .../nodes/shader/nodes/node_shader_hueSatVal.cc | 2 +- .../nodes/shader/nodes/node_shader_ies_light.cc | 4 +- .../nodes/shader/nodes/node_shader_invert.cc | 2 +- .../nodes/shader/nodes/node_shader_layer_weight.cc | 2 +- .../shader/nodes/node_shader_light_falloff.cc | 2 +- .../nodes/shader/nodes/node_shader_light_path.cc | 2 +- .../nodes/shader/nodes/node_shader_map_range.cc | 6 +- .../nodes/shader/nodes/node_shader_mapping.cc | 4 +- .../blender/nodes/shader/nodes/node_shader_math.cc | 2 +- .../blender/nodes/shader/nodes/node_shader_mix.cc | 10 +- .../nodes/shader/nodes/node_shader_mix_rgb.cc | 4 +- .../nodes/shader/nodes/node_shader_mix_shader.cc | 2 +- .../nodes/shader/nodes/node_shader_normal.cc | 2 +- .../nodes/shader/nodes/node_shader_normal_map.cc | 4 +- .../nodes/shader/nodes/node_shader_object_info.cc | 2 +- .../nodes/shader/nodes/node_shader_output_aov.cc | 6 +- .../nodes/shader/nodes/node_shader_output_light.cc | 6 +- .../shader/nodes/node_shader_output_linestyle.cc | 2 +- .../shader/nodes/node_shader_output_material.cc | 6 +- .../nodes/shader/nodes/node_shader_output_world.cc | 6 +- .../shader/nodes/node_shader_particle_info.cc | 2 +- .../nodes/shader/nodes/node_shader_point_info.cc | 2 +- .../blender/nodes/shader/nodes/node_shader_rgb.cc | 2 +- .../nodes/shader/nodes/node_shader_rgb_to_bw.cc | 2 +- .../nodes/shader/nodes/node_shader_script.cc | 8 +- .../shader/nodes/node_shader_sepcomb_color.cc | 10 +- .../nodes/shader/nodes/node_shader_sepcomb_hsv.cc | 4 +- .../nodes/shader/nodes/node_shader_sepcomb_rgb.cc | 6 +- .../nodes/shader/nodes/node_shader_sepcomb_xyz.cc | 6 +- .../shader/nodes/node_shader_shader_to_rgb.cc | 2 +- .../nodes/shader/nodes/node_shader_squeeze.cc | 2 +- .../nodes/node_shader_subsurface_scattering.cc | 6 +- .../nodes/shader/nodes/node_shader_tangent.cc | 4 +- .../nodes/shader/nodes/node_shader_tex_brick.cc | 8 +- .../nodes/shader/nodes/node_shader_tex_checker.cc | 6 +- .../nodes/shader/nodes/node_shader_tex_coord.cc | 4 +- .../shader/nodes/node_shader_tex_environment.cc | 4 +- .../nodes/shader/nodes/node_shader_tex_gradient.cc | 8 +- .../nodes/shader/nodes/node_shader_tex_image.cc | 4 +- .../nodes/shader/nodes/node_shader_tex_magic.cc | 8 +- .../nodes/shader/nodes/node_shader_tex_musgrave.cc | 8 +- .../nodes/shader/nodes/node_shader_tex_noise.cc | 8 +- .../shader/nodes/node_shader_tex_pointdensity.cc | 8 +- .../nodes/shader/nodes/node_shader_tex_sky.cc | 4 +- .../nodes/shader/nodes/node_shader_tex_voronoi.cc | 12 +- .../nodes/shader/nodes/node_shader_tex_wave.cc | 8 +- .../shader/nodes/node_shader_tex_white_noise.cc | 8 +- .../shader/nodes/node_shader_uv_along_stroke.cc | 2 +- .../nodes/shader/nodes/node_shader_uvmap.cc | 4 +- .../nodes/shader/nodes/node_shader_value.cc | 2 +- .../nodes/node_shader_vector_displacement.cc | 4 +- .../nodes/shader/nodes/node_shader_vector_math.cc | 4 +- .../shader/nodes/node_shader_vector_rotate.cc | 4 +- .../shader/nodes/node_shader_vector_transform.cc | 6 +- .../nodes/shader/nodes/node_shader_vertex_color.cc | 4 +- .../shader/nodes/node_shader_volume_absorption.cc | 2 +- .../nodes/shader/nodes/node_shader_volume_info.cc | 6 +- .../shader/nodes/node_shader_volume_principled.cc | 4 +- .../shader/nodes/node_shader_volume_scatter.cc | 2 +- .../nodes/shader/nodes/node_shader_wavelength.cc | 2 +- .../nodes/shader/nodes/node_shader_wireframe.cc | 4 +- .../python/gpu/gpu_py_shader_create_info.cc | 9 +- source/blender/render/intern/engine.cc | 2 +- source/blender/render/intern/pipeline.cc | 18 +- .../blender/simulation/intern/SIM_mass_spring.cpp | 11 +- source/blender/windowmanager/intern/wm_dragdrop.cc | 12 +- .../windowmanager/intern/wm_event_system.cc | 6 +- 601 files changed, 2305 insertions(+), 2443 deletions(-) diff --git a/source/blender/blenkernel/BKE_image_partial_update.hh b/source/blender/blenkernel/BKE_image_partial_update.hh index 6611efe7a61..b9b748880bb 100644 --- a/source/blender/blenkernel/BKE_image_partial_update.hh +++ b/source/blender/blenkernel/BKE_image_partial_update.hh @@ -122,11 +122,11 @@ class AbstractTileData { */ class NoTileData : AbstractTileData { public: - NoTileData(Image *UNUSED(image), ImageUser *UNUSED(image_user)) + NoTileData(Image * /*image*/, ImageUser * /*image_user*/) { } - void init_data(TileNumber UNUSED(new_tile_number)) override + void init_data(TileNumber /*new_tile_number*/) override { } diff --git a/source/blender/blenkernel/intern/asset.cc b/source/blender/blenkernel/intern/asset.cc index 9d9ed219cbb..67802b1d6b4 100644 --- a/source/blender/blenkernel/intern/asset.cc +++ b/source/blender/blenkernel/intern/asset.cc @@ -143,7 +143,7 @@ IDProperty *BKE_asset_metadata_idprop_find(const AssetMetaData *asset_data, cons /* Queries -------------------------------------------- */ -PreviewImage *BKE_asset_metadata_preview_get_from_id(const AssetMetaData *UNUSED(asset_data), +PreviewImage *BKE_asset_metadata_preview_get_from_id(const AssetMetaData * /*asset_data*/, const ID *id) { return BKE_previewimg_id_get(id); diff --git a/source/blender/blenkernel/intern/attribute_access_intern.hh b/source/blender/blenkernel/intern/attribute_access_intern.hh index 5fbca283399..33d415f1e0e 100644 --- a/source/blender/blenkernel/intern/attribute_access_intern.hh +++ b/source/blender/blenkernel/intern/attribute_access_intern.hh @@ -334,7 +334,7 @@ class ComponentAttributeProviders { namespace attribute_accessor_functions { template -inline bool is_builtin(const void *UNUSED(owner), const AttributeIDRef &attribute_id) +inline bool is_builtin(const void * /*owner*/, const AttributeIDRef &attribute_id) { if (!attribute_id.is_named()) { return false; diff --git a/source/blender/blenkernel/intern/brush.cc b/source/blender/blenkernel/intern/brush.cc index 7261e0a5869..20d86ea5a2d 100644 --- a/source/blender/blenkernel/intern/brush.cc +++ b/source/blender/blenkernel/intern/brush.cc @@ -56,7 +56,7 @@ static void brush_init_data(ID *id) BKE_brush_curve_preset(brush, CURVE_PRESET_SMOOTH); } -static void brush_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src, const int flag) +static void brush_copy_data(Main * /*bmain*/, ID *id_dst, const ID *id_src, const int flag) { Brush *brush_dst = (Brush *)id_dst; const Brush *brush_src = (const Brush *)id_src; diff --git a/source/blender/blenkernel/intern/bvhutils.cc b/source/blender/blenkernel/intern/bvhutils.cc index 9bea8a0d6d3..58b377eecdb 100644 --- a/source/blender/blenkernel/intern/bvhutils.cc +++ b/source/blender/blenkernel/intern/bvhutils.cc @@ -178,7 +178,7 @@ static void bvhtree_balance(BVHTree *tree, const bool isolate) /* Math stuff for ray casting on mesh faces and for nearest surface */ float bvhtree_ray_tri_intersection(const BVHTreeRay *ray, - const float UNUSED(m_dist), + const float /*m_dist*/, const float v0[3], const float v1[3], const float v2[3]) @@ -1136,7 +1136,7 @@ BVHTree *bvhtree_from_mesh_looptri_ex(BVHTreeFromMesh *data, static BLI_bitmap *loose_verts_map_get(const MEdge *medge, int edges_num, - const MVert *UNUSED(mvert), + const MVert * /*mvert*/, int verts_num, int *r_loose_vert_num) { diff --git a/source/blender/blenkernel/intern/cryptomatte.cc b/source/blender/blenkernel/intern/cryptomatte.cc index e5f85f6aecf..5ba56946d8d 100644 --- a/source/blender/blenkernel/intern/cryptomatte.cc +++ b/source/blender/blenkernel/intern/cryptomatte.cc @@ -580,7 +580,7 @@ blender::StringRef CryptomatteStampDataCallbackData::extract_layer_hash(blender: void CryptomatteStampDataCallbackData::extract_layer_names(void *_data, const char *propname, char *propvalue, - int UNUSED(len)) + int /*len*/) { CryptomatteStampDataCallbackData *data = static_cast(_data); @@ -598,7 +598,7 @@ void CryptomatteStampDataCallbackData::extract_layer_names(void *_data, void CryptomatteStampDataCallbackData::extract_layer_manifest(void *_data, const char *propname, char *propvalue, - int UNUSED(len)) + int /*len*/) { CryptomatteStampDataCallbackData *data = static_cast(_data); diff --git a/source/blender/blenkernel/intern/cryptomatte_test.cc b/source/blender/blenkernel/intern/cryptomatte_test.cc index bb09b276645..8d360677599 100644 --- a/source/blender/blenkernel/intern/cryptomatte_test.cc +++ b/source/blender/blenkernel/intern/cryptomatte_test.cc @@ -88,10 +88,10 @@ TEST(cryptomatte, extract_layer_hash_from_metadata_key) "cryptomatte/")); } -static void validate_cryptomatte_session_from_stamp_data(void *UNUSED(data), +static void validate_cryptomatte_session_from_stamp_data(void * /*data*/, const char *propname, char *propvalue, - int UNUSED(len)) + int /*len*/) { blender::StringRefNull prop_name(propname); if (!prop_name.startswith("cryptomatte/")) { diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc index 95ef94a6cd5..86db46e6161 100644 --- a/source/blender/blenkernel/intern/curve.cc +++ b/source/blender/blenkernel/intern/curve.cc @@ -1056,7 +1056,7 @@ BPoint *BKE_nurb_bpoint_get_prev(Nurb *nu, BPoint *bp) return bp_prev; } -void BKE_nurb_bezt_calc_normal(struct Nurb *UNUSED(nu), BezTriple *bezt, float r_normal[3]) +void BKE_nurb_bezt_calc_normal(struct Nurb * /*nu*/, BezTriple *bezt, float r_normal[3]) { /* calculate the axis matrix from the spline */ float dir_prev[3], dir_next[3]; diff --git a/source/blender/blenkernel/intern/curves.cc b/source/blender/blenkernel/intern/curves.cc index d801484de62..01be22a57b0 100644 --- a/source/blender/blenkernel/intern/curves.cc +++ b/source/blender/blenkernel/intern/curves.cc @@ -63,7 +63,7 @@ static void curves_init_data(ID *id) new (&curves->geometry) blender::bke::CurvesGeometry(); } -static void curves_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src, const int flag) +static void curves_copy_data(Main * /*bmain*/, ID *id_dst, const ID *id_src, const int flag) { using namespace blender; @@ -263,7 +263,7 @@ BoundBox *BKE_curves_boundbox_get(Object *ob) return ob->runtime.bb; } -bool BKE_curves_attribute_required(const Curves *UNUSED(curves), const char *name) +bool BKE_curves_attribute_required(const Curves * /*curves*/, const char *name) { return STREQ(name, ATTR_POSITION); } diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc index 32a6bc6ecb9..be99a8ee87b 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/source/blender/blenkernel/intern/customdata.cc @@ -232,7 +232,7 @@ static void layerFree_mdeformvert(void *data, const int count, const int size) static void layerInterp_mdeformvert(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, const int count, void *dest) { @@ -331,7 +331,7 @@ static void layerConstruct_mdeformvert(void *data, const int count) static void layerInterp_normal(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, const int count, void *dest) { @@ -472,7 +472,7 @@ static void layerCopy_propFloat(const void *source, void *dest, const int count) static void layerInterp_propFloat(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, const int count, void *dest) { @@ -510,7 +510,7 @@ static bool layerValidate_propFloat(void *data, const uint totitems, const bool static void layerInterp_propInt(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, const int count, void *dest) { @@ -659,7 +659,7 @@ static void layerCopy_mdisps(const void *source, void *dest, const int count) } } -static void layerFree_mdisps(void *data, const int count, const int UNUSED(size)) +static void layerFree_mdisps(void *data, const int count, const int /*size*/) { MDisps *d = static_cast(data); @@ -714,7 +714,7 @@ static bool layerWrite_mdisps(CDataFile *cdf, const void *data, const int count) return true; } -static size_t layerFilesize_mdisps(CDataFile *UNUSED(cdf), const void *data, const int count) +static size_t layerFilesize_mdisps(CDataFile * /*cdf*/, const void *data, const int count) { const MDisps *d = static_cast(data); size_t size = 0; @@ -733,7 +733,7 @@ static size_t layerFilesize_mdisps(CDataFile *UNUSED(cdf), const void *data, con * \{ */ /* copy just zeros in this case */ -static void layerCopy_bmesh_elem_py_ptr(const void *UNUSED(source), void *dest, const int count) +static void layerCopy_bmesh_elem_py_ptr(const void * /*source*/, void *dest, const int count) { const int size = sizeof(void *); @@ -744,7 +744,7 @@ static void layerCopy_bmesh_elem_py_ptr(const void *UNUSED(source), void *dest, } #ifndef WITH_PYTHON -void bpy_bm_generic_invalidate(struct BPy_BMGeneric *UNUSED(self)) +void bpy_bm_generic_invalidate(struct BPy_BMGeneric * /*self*/) { /* dummy */ } @@ -768,7 +768,7 @@ static void layerFree_bmesh_elem_py_ptr(void *data, const int count, const int s static void layerInterp_paint_mask(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, int count, void *dest) { @@ -804,7 +804,7 @@ static void layerCopy_grid_paint_mask(const void *source, void *dest, const int } } -static void layerFree_grid_paint_mask(void *data, const int count, const int UNUSED(size)) +static void layerFree_grid_paint_mask(void *data, const int count, const int /*size*/) { GridPaintMask *gpm = static_cast(data); @@ -977,7 +977,7 @@ static void layerDefault_mloopcol(void *data, const int count) static void layerInterp_mloopcol(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, int count, void *dest) { @@ -1075,7 +1075,7 @@ static void layerAdd_mloopuv(void *data1, const void *data2) static void layerInterp_mloopuv(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, int count, void *dest) { @@ -1118,8 +1118,8 @@ static bool layerValidate_mloopuv(void *data, const uint totitems, const bool do /* origspace is almost exact copy of mloopuv's, keep in sync */ static void layerCopyValue_mloop_origspace(const void *source, void *dest, - const int UNUSED(mixmode), - const float UNUSED(mixfactor)) + const int /*mixmode*/, + const float /*mixfactor*/) { const OrigSpaceLoop *luv1 = static_cast(source); OrigSpaceLoop *luv2 = static_cast(dest); @@ -1169,7 +1169,7 @@ static void layerAdd_mloop_origspace(void *data1, const void *data2) static void layerInterp_mloop_origspace(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, int count, void *dest) { @@ -1267,7 +1267,7 @@ static void layerDefault_origindex(void *data, const int count) static void layerInterp_bweight(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, int count, void *dest) { @@ -1290,7 +1290,7 @@ static void layerInterp_bweight(const void **sources, static void layerInterp_shapekey(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, int count, void *dest) { @@ -1335,7 +1335,7 @@ static void layerCopy_mvert_skin(const void *source, void *dest, const int count static void layerInterp_mvert_skin(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, int count, void *dest) { @@ -1498,7 +1498,7 @@ static void layerDefault_propcol(void *data, const int count) static void layerInterp_propcol(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, int count, void *dest) { @@ -1520,7 +1520,7 @@ static void layerInterp_propcol(const void **sources, static void layerInterp_propfloat3(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, int count, void *dest) { @@ -1573,7 +1573,7 @@ static bool layerValidate_propfloat3(void *data, const uint totitems, const bool static void layerInterp_propfloat2(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, int count, void *dest) { @@ -1624,7 +1624,7 @@ static bool layerValidate_propfloat2(void *data, const uint totitems, const bool static void layerInterp_propbool(const void **sources, const float *weights, - const float *UNUSED(sub_weights), + const float * /*sub_weights*/, int count, void *dest) { @@ -3163,7 +3163,7 @@ void *CustomData_duplicate_referenced_layer_named(CustomData *data, } void *CustomData_duplicate_referenced_layer_anonymous(CustomData *data, - const int UNUSED(type), + const int /*type*/, const AnonymousAttributeID *anonymous_id, const int totelem) { @@ -4594,10 +4594,7 @@ static void customdata_external_filename(char filepath[FILE_MAX], BLI_path_abs(filepath, ID_BLEND_PATH_FROM_GLOBAL(id)); } -void CustomData_external_reload(CustomData *data, - ID *UNUSED(id), - eCustomDataMask mask, - int totelem) +void CustomData_external_reload(CustomData *data, ID * /*id*/, eCustomDataMask mask, int totelem) { for (int i = 0; i < data->totlayer; i++) { CustomDataLayer *layer = &data->layers[i]; @@ -4791,11 +4788,8 @@ void CustomData_external_write( cdf_free(cdf); } -void CustomData_external_add(CustomData *data, - ID *UNUSED(id), - const int type, - const int UNUSED(totelem), - const char *filepath) +void CustomData_external_add( + CustomData *data, ID * /*id*/, const int type, const int /*totelem*/, const char *filepath) { CustomDataExternal *external = data->external; diff --git a/source/blender/blenkernel/intern/editmesh.cc b/source/blender/blenkernel/intern/editmesh.cc index 34218abf200..fb4cfad0fb9 100644 --- a/source/blender/blenkernel/intern/editmesh.cc +++ b/source/blender/blenkernel/intern/editmesh.cc @@ -290,7 +290,7 @@ void BKE_editmesh_ensure_autosmooth(BMEditMesh *em, Mesh *me) } } -BoundBox *BKE_editmesh_cage_boundbox_get(Object *object, BMEditMesh *UNUSED(em)) +BoundBox *BKE_editmesh_cage_boundbox_get(Object *object, BMEditMesh * /*em*/) { if (object->runtime.editmesh_bb_cage == nullptr) { float min[3], max[3]; diff --git a/source/blender/blenkernel/intern/editmesh_tangent.cc b/source/blender/blenkernel/intern/editmesh_tangent.cc index 6ce9d3c7bb5..016cf6acbcc 100644 --- a/source/blender/blenkernel/intern/editmesh_tangent.cc +++ b/source/blender/blenkernel/intern/editmesh_tangent.cc @@ -147,7 +147,7 @@ struct SGLSLEditMeshToTangent { #endif }; -static void emDM_calc_loop_tangents_thread(TaskPool *__restrict UNUSED(pool), void *taskdata) +static void emDM_calc_loop_tangents_thread(TaskPool *__restrict /*pool*/, void *taskdata) { SGLSLEditMeshToTangent *mesh_data = static_cast(taskdata); diff --git a/source/blender/blenkernel/intern/geometry_component_curves.cc b/source/blender/blenkernel/intern/geometry_component_curves.cc index 4ace68546ac..d6987d76028 100644 --- a/source/blender/blenkernel/intern/geometry_component_curves.cc +++ b/source/blender/blenkernel/intern/geometry_component_curves.cc @@ -266,7 +266,7 @@ CurveLengthFieldInput::CurveLengthFieldInput() GVArray CurveLengthFieldInput::get_varray_for_context(const CurvesGeometry &curves, const eAttrDomain domain, - IndexMask UNUSED(mask)) const + const IndexMask /*mask*/) const { return construct_curve_length_gvarray(curves, domain); } @@ -617,7 +617,7 @@ static AttributeAccessorFunctions get_curves_accessor_functions() return 0; } }; - fn.domain_supported = [](const void *UNUSED(owner), const eAttrDomain domain) { + fn.domain_supported = [](const void * /*owner*/, const eAttrDomain domain) { return ELEM(domain, ATTR_DOMAIN_POINT, ATTR_DOMAIN_CURVE); }; fn.adapt_domain = [](const void *owner, diff --git a/source/blender/blenkernel/intern/geometry_component_instances.cc b/source/blender/blenkernel/intern/geometry_component_instances.cc index 3a065c3576b..0b5f7cbf902 100644 --- a/source/blender/blenkernel/intern/geometry_component_instances.cc +++ b/source/blender/blenkernel/intern/geometry_component_instances.cc @@ -413,17 +413,17 @@ class InstancePositionAttributeProvider final : public BuiltinAttributeProvider domain_}; } - bool try_delete(void *UNUSED(owner)) const final + bool try_delete(void * /*owner*/) const final { return false; } - bool try_create(void *UNUSED(owner), const AttributeInit &UNUSED(initializer)) const final + bool try_create(void * /*owner*/, const AttributeInit & /*initializer*/) const final { return false; } - bool exists(const void *UNUSED(owner)) const final + bool exists(const void * /*owner*/) const final { return true; } @@ -487,10 +487,10 @@ static AttributeAccessorFunctions get_instances_accessor_functions() return 0; } }; - fn.domain_supported = [](const void *UNUSED(owner), const eAttrDomain domain) { + fn.domain_supported = [](const void * /*owner*/, const eAttrDomain domain) { return domain == ATTR_DOMAIN_INSTANCE; }; - fn.adapt_domain = [](const void *UNUSED(owner), + fn.adapt_domain = [](const void * /*owner*/, const blender::GVArray &varray, const eAttrDomain from_domain, const eAttrDomain to_domain) { diff --git a/source/blender/blenkernel/intern/geometry_component_mesh.cc b/source/blender/blenkernel/intern/geometry_component_mesh.cc index bf1dc1453c2..5a1333e1d75 100644 --- a/source/blender/blenkernel/intern/geometry_component_mesh.cc +++ b/source/blender/blenkernel/intern/geometry_component_mesh.cc @@ -1132,17 +1132,17 @@ class NormalAttributeProvider final : public BuiltinAttributeProvider { return VArray::ForSpan({(float3 *)BKE_mesh_poly_normals_ensure(mesh), mesh->totpoly}); } - GAttributeWriter try_get_for_write(void *UNUSED(owner)) const final + GAttributeWriter try_get_for_write(void * /*owner*/) const final { return {}; } - bool try_delete(void *UNUSED(owner)) const final + bool try_delete(void * /*owner*/) const final { return false; } - bool try_create(void *UNUSED(owner), const AttributeInit &UNUSED(initializer)) const final + bool try_create(void * /*owner*/, const AttributeInit & /*initializer*/) const final { return false; } @@ -1312,7 +1312,7 @@ static AttributeAccessorFunctions get_mesh_accessor_functions() return 0; } }; - fn.domain_supported = [](const void *UNUSED(owner), const eAttrDomain domain) { + fn.domain_supported = [](const void * /*owner*/, const eAttrDomain domain) { return ELEM(domain, ATTR_DOMAIN_POINT, ATTR_DOMAIN_EDGE, ATTR_DOMAIN_FACE, ATTR_DOMAIN_CORNER); }; fn.adapt_domain = [](const void *owner, diff --git a/source/blender/blenkernel/intern/geometry_component_pointcloud.cc b/source/blender/blenkernel/intern/geometry_component_pointcloud.cc index 6980b561bc3..34cc99d2f92 100644 --- a/source/blender/blenkernel/intern/geometry_component_pointcloud.cc +++ b/source/blender/blenkernel/intern/geometry_component_pointcloud.cc @@ -180,10 +180,10 @@ static AttributeAccessorFunctions get_pointcloud_accessor_functions() return 0; } }; - fn.domain_supported = [](const void *UNUSED(owner), const eAttrDomain domain) { + fn.domain_supported = [](const void * /*owner*/, const eAttrDomain domain) { return domain == ATTR_DOMAIN_POINT; }; - fn.adapt_domain = [](const void *UNUSED(owner), + fn.adapt_domain = [](const void * /*owner*/, const blender::GVArray &varray, const eAttrDomain from_domain, const eAttrDomain to_domain) { diff --git a/source/blender/blenkernel/intern/geometry_fields.cc b/source/blender/blenkernel/intern/geometry_fields.cc index e242154cb5b..00913905c1c 100644 --- a/source/blender/blenkernel/intern/geometry_fields.cc +++ b/source/blender/blenkernel/intern/geometry_fields.cc @@ -242,7 +242,7 @@ GVArray InstancesFieldInput::get_varray_for_context(const fn::FieldContext &cont } GVArray AttributeFieldInput::get_varray_for_context(const GeometryFieldContext &context, - IndexMask UNUSED(mask)) const + const IndexMask /*mask*/) const { const eCustomDataType data_type = cpp_type_to_custom_data_type(*type_); if (auto attributes = context.attributes()) { diff --git a/source/blender/blenkernel/intern/idprop_serialize.cc b/source/blender/blenkernel/intern/idprop_serialize.cc index 9e5733e5a2b..8381b0a1755 100644 --- a/source/blender/blenkernel/intern/idprop_serialize.cc +++ b/source/blender/blenkernel/intern/idprop_serialize.cc @@ -665,7 +665,7 @@ class IDPUnknownSerializer : public IDPropertySerializer { } std::shared_ptr idprop_to_dictionary( - const struct IDProperty *UNUSED(id_property)) const override + const struct IDProperty * /*id_property*/) const override { BLI_assert_unreachable(); return nullptr; @@ -677,7 +677,7 @@ class IDPUnknownSerializer : public IDPropertySerializer { } std::unique_ptr entry_to_idprop( - DictionaryEntryParser &UNUSED(entry_reader)) const override + DictionaryEntryParser & /*entry_reader*/) const override { return nullptr; } diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index f6e19277993..409eb0067b5 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -153,7 +153,7 @@ static void image_init_data(ID *id) } } -static void image_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src, const int flag) +static void image_copy_data(Main * /*bmain*/, ID *id_dst, const ID *id_src, const int flag) { Image *image_dst = (Image *)id_dst; const Image *image_src = (const Image *)id_src; @@ -410,7 +410,7 @@ static void image_blend_read_data(BlendDataReader *reader, ID *id) image_runtime_reset(ima); } -static void image_blend_read_lib(BlendLibReader *UNUSED(reader), ID *id) +static void image_blend_read_lib(BlendLibReader * /*reader*/, ID *id) { Image *ima = (Image *)id; /* Images have some kind of 'main' cache, when null we should also clear all others. */ @@ -1546,7 +1546,7 @@ void BKE_image_print_memlist(Main *bmain) } } -static bool imagecache_check_dirty(ImBuf *ibuf, void *UNUSED(userkey), void *UNUSED(userdata)) +static bool imagecache_check_dirty(ImBuf *ibuf, void * /*userkey*/, void * /*userdata*/) { if (ibuf == nullptr) { return false; @@ -1595,7 +1595,7 @@ void BKE_image_free_all_textures(Main *bmain) #endif } -static bool imagecache_check_free_anim(ImBuf *ibuf, void *UNUSED(userkey), void *userdata) +static bool imagecache_check_free_anim(ImBuf *ibuf, void * /*userkey*/, void *userdata) { if (ibuf == nullptr) { return true; @@ -2470,7 +2470,7 @@ void BKE_stamp_data_free(StampData *stamp_data) } /* wrap for callback only */ -static void metadata_set_field(void *data, const char *propname, char *propvalue, int UNUSED(len)) +static void metadata_set_field(void *data, const char *propname, char *propvalue, int /*len*/) { /* We know it is an ImBuf* because that's what we pass to BKE_stamp_info_callback. */ ImBuf *imbuf = static_cast(data); @@ -3876,7 +3876,7 @@ static void image_create_multilayer(Image *ima, ImBuf *ibuf, int framenr) #endif /* WITH_OPENEXR */ /** Common stuff to do with images after loading. */ -static void image_init_after_load(Image *ima, ImageUser *iuser, ImBuf *UNUSED(ibuf)) +static void image_init_after_load(Image *ima, ImageUser *iuser, ImBuf * /*ibuf*/) { /* Preview is null when it has never been used as an icon before. * Never handle previews/icons outside of main thread. */ @@ -5024,7 +5024,7 @@ void BKE_image_user_frame_calc(Image *ima, ImageUser *iuser, int cfra) /* goes over all ImageUsers, and sets frame numbers if auto-refresh is set */ static void image_editors_update_frame(Image *ima, - ID *UNUSED(iuser_id), + ID * /*iuser_id*/, ImageUser *iuser, void *customdata) { @@ -5046,8 +5046,8 @@ void BKE_image_editors_update_frame(const Main *bmain, int cfra) } static void image_user_id_has_animation(Image *ima, - ID *UNUSED(iuser_id), - ImageUser *UNUSED(iuser), + ID * /*iuser_id*/, + ImageUser * /*iuser*/, void *customdata) { if (ima && BKE_image_is_animated(ima)) { @@ -5066,7 +5066,7 @@ bool BKE_image_user_id_has_animation(ID *id) } static void image_user_id_eval_animation(Image *ima, - ID *UNUSED(iduser_id), + ID * /*iduser_id*/, ImageUser *iuser, void *customdata) { @@ -5330,7 +5330,7 @@ bool BKE_image_is_dirty(Image *image) return BKE_image_is_dirty_writable(image, nullptr); } -void BKE_image_mark_dirty(Image *UNUSED(image), ImBuf *ibuf) +void BKE_image_mark_dirty(Image * /*image*/, ImBuf *ibuf) { ibuf->userflags |= IB_BITMAPDIRTY; } diff --git a/source/blender/blenkernel/intern/lib_id_remapper.cc b/source/blender/blenkernel/intern/lib_id_remapper.cc index 98ac9110a48..cedbab5aa18 100644 --- a/source/blender/blenkernel/intern/lib_id_remapper.cc +++ b/source/blender/blenkernel/intern/lib_id_remapper.cc @@ -221,7 +221,7 @@ const char *BKE_id_remapper_result_string(const IDRemapperApplyResult result) return ""; } -static void id_remapper_print_item_cb(ID *old_id, ID *new_id, void *UNUSED(user_data)) +static void id_remapper_print_item_cb(ID *old_id, ID *new_id, void * /*user_data*/) { if (old_id != nullptr && new_id != nullptr) { printf("Remap %s(%p) to %s(%p)\n", old_id->name, old_id, new_id->name, new_id); diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc index 7202570f732..db8d88854df 100644 --- a/source/blender/blenkernel/intern/lib_override.cc +++ b/source/blender/blenkernel/intern/lib_override.cc @@ -3131,7 +3131,7 @@ bool BKE_lib_override_library_property_operation_operands_validate( return true; } -void BKE_lib_override_library_validate(Main *UNUSED(bmain), ID *id, ReportList *reports) +void BKE_lib_override_library_validate(Main * /*bmain*/, ID *id, ReportList *reports) { if (id->override_library == nullptr) { return; @@ -3938,8 +3938,8 @@ ID *BKE_lib_override_library_operations_store_start(Main *bmain, return storage_id; } -void BKE_lib_override_library_operations_store_end( - OverrideLibraryStorage *UNUSED(override_storage), ID *local) +void BKE_lib_override_library_operations_store_end(OverrideLibraryStorage * /*override_storage*/, + ID *local) { BLI_assert(ID_IS_OVERRIDE_LIBRARY_REAL(local)); diff --git a/source/blender/blenkernel/intern/mball.cc b/source/blender/blenkernel/intern/mball.cc index 7c83bed85b0..d9b08d4fe2d 100644 --- a/source/blender/blenkernel/intern/mball.cc +++ b/source/blender/blenkernel/intern/mball.cc @@ -65,10 +65,7 @@ static void metaball_init_data(ID *id) MEMCPY_STRUCT_AFTER(metaball, DNA_struct_default_get(MetaBall), id); } -static void metaball_copy_data(Main *UNUSED(bmain), - ID *id_dst, - const ID *id_src, - const int UNUSED(flag)) +static void metaball_copy_data(Main * /*bmain*/, ID *id_dst, const ID *id_src, const int /*flag*/) { MetaBall *metaball_dst = (MetaBall *)id_dst; const MetaBall *metaball_src = (const MetaBall *)id_src; diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index 4c6ecff60ad..1fd4bbd2bff 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/source/blender/blenkernel/intern/mesh_convert.cc @@ -604,7 +604,7 @@ void BKE_mesh_to_curve_nurblist(const Mesh *me, ListBase *nurblist, const int ed } } -void BKE_mesh_to_curve(Main *bmain, Depsgraph *depsgraph, Scene *UNUSED(scene), Object *ob) +void BKE_mesh_to_curve(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/, Object *ob) { /* make new mesh data from the original copy */ Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); @@ -654,7 +654,7 @@ void BKE_pointcloud_from_mesh(Mesh *me, PointCloud *pointcloud) point_positions.finish(); } -void BKE_mesh_to_pointcloud(Main *bmain, Depsgraph *depsgraph, Scene *UNUSED(scene), Object *ob) +void BKE_mesh_to_pointcloud(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/, Object *ob) { BLI_assert(ob->type == OB_MESH); @@ -710,7 +710,7 @@ void BKE_mesh_edges_set_draw_render(Mesh *mesh) } } -void BKE_pointcloud_to_mesh(Main *bmain, Depsgraph *depsgraph, Scene *UNUSED(scene), Object *ob) +void BKE_pointcloud_to_mesh(Main *bmain, Depsgraph *depsgraph, Scene * /*scene*/, Object *ob) { BLI_assert(ob->type == OB_POINTCLOUD); diff --git a/source/blender/blenkernel/intern/mesh_evaluate.cc b/source/blender/blenkernel/intern/mesh_evaluate.cc index ae0d5efa112..9a199c9c768 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.cc +++ b/source/blender/blenkernel/intern/mesh_evaluate.cc @@ -528,7 +528,7 @@ bool BKE_mesh_center_of_volume(const Mesh *me, float r_cent[3]) * \{ */ static bool mesh_calc_center_centroid_ex(const MVert *mverts, - int UNUSED(mverts_num), + int /*mverts_num*/, const MLoopTri *looptri, int looptri_num, const MLoop *mloop, diff --git a/source/blender/blenkernel/intern/mesh_fair.cc b/source/blender/blenkernel/intern/mesh_fair.cc index df61169fa5c..501f01e3368 100644 --- a/source/blender/blenkernel/intern/mesh_fair.cc +++ b/source/blender/blenkernel/intern/mesh_fair.cc @@ -440,7 +440,7 @@ class VoronoiVertexWeight : public VertexWeight { class UniformLoopWeight : public LoopWeight { public: - float weight_at_index(const int UNUSED(index)) override + float weight_at_index(const int /*index*/) override { return 1.0f; } diff --git a/source/blender/blenkernel/intern/mesh_mapping.cc b/source/blender/blenkernel/intern/mesh_mapping.cc index c1523f0a525..05d1a478c09 100644 --- a/source/blender/blenkernel/intern/mesh_mapping.cc +++ b/source/blender/blenkernel/intern/mesh_mapping.cc @@ -262,12 +262,12 @@ void BKE_mesh_vert_loop_map_create(MeshElemMap **r_map, void BKE_mesh_vert_looptri_map_create(MeshElemMap **r_map, int **r_mem, - const MVert *UNUSED(mvert), + const MVert * /*mvert*/, const int totvert, const MLoopTri *mlooptri, const int totlooptri, const MLoop *mloop, - const int UNUSED(totloop)) + const int /*totloop*/) { MeshElemMap *map = MEM_cnew_array(size_t(totvert), __func__); int *indices = static_cast(MEM_mallocN(sizeof(int) * size_t(totlooptri) * 3, __func__)); @@ -384,7 +384,7 @@ void BKE_mesh_vert_edge_vert_map_create( void BKE_mesh_edge_loop_map_create(MeshElemMap **r_map, int **r_mem, - const MEdge *UNUSED(medge), + const MEdge * /*medge*/, const int totedge, const MPoly *mpoly, const int totpoly, @@ -437,7 +437,7 @@ void BKE_mesh_edge_loop_map_create(MeshElemMap **r_map, void BKE_mesh_edge_poly_map_create(MeshElemMap **r_map, int **r_mem, - const MEdge *UNUSED(medge), + const MEdge * /*medge*/, const int totedge, const MPoly *mpoly, const int totpoly, @@ -802,12 +802,12 @@ static void poly_edge_loop_islands_calc(const MEdge *medge, } static bool poly_is_island_boundary_smooth_cb(const MPoly *mp, - const MLoop *UNUSED(ml), + const MLoop * /*ml*/, const MEdge *me, const int edge_user_count, const MPoly *mpoly_array, const MeshElemMap *edge_poly_map, - void *UNUSED(user_data)) + void * /*user_data*/) { /* Edge is sharp if one of its polys is flat, or edge itself is sharp, * or edge is not used by exactly two polygons. */ @@ -977,12 +977,12 @@ struct MeshCheckIslandBoundaryUv { const MeshElemMap *edge_loop_map; }; -static bool mesh_check_island_boundary_uv(const MPoly *UNUSED(mp), +static bool mesh_check_island_boundary_uv(const MPoly * /*mp*/, const MLoop *ml, const MEdge *me, - const int UNUSED(edge_user_count), - const MPoly *UNUSED(mpoly_array), - const MeshElemMap *UNUSED(edge_poly_map), + const int /*edge_user_count*/, + const MPoly * /*mpoly_array*/, + const MeshElemMap * /*edge_poly_map*/, void *user_data) { if (user_data) { @@ -1021,8 +1021,8 @@ static bool mesh_check_island_boundary_uv(const MPoly *UNUSED(mp), return (me->flag & ME_SEAM) != 0; } -static bool mesh_calc_islands_loop_poly_uv(const MVert *UNUSED(verts), - const int UNUSED(totvert), +static bool mesh_calc_islands_loop_poly_uv(const MVert * /*verts*/, + const int /*totvert*/, const MEdge *edges, const int totedge, const MPoly *polys, diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc index 55d83b64e39..e589aff1c73 100644 --- a/source/blender/blenkernel/intern/mesh_normals.cc +++ b/source/blender/blenkernel/intern/mesh_normals.cc @@ -181,7 +181,7 @@ struct MeshCalcNormalsData_Poly { static void mesh_calc_normals_poly_fn(void *__restrict userdata, const int pidx, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { const MeshCalcNormalsData_Poly *data = (MeshCalcNormalsData_Poly *)userdata; const MPoly *mp = &data->mpoly[pidx]; @@ -189,9 +189,9 @@ static void mesh_calc_normals_poly_fn(void *__restrict userdata, } void BKE_mesh_calc_normals_poly(const MVert *mvert, - int UNUSED(mvert_len), + int /*mvert_len*/, const MLoop *mloop, - int UNUSED(mloop_len), + int /*mloop_len*/, const MPoly *mpoly, int mpoly_len, float (*r_poly_normals)[3]) @@ -231,8 +231,9 @@ struct MeshCalcNormalsData_PolyAndVertex { float (*vnors)[3]; }; -static void mesh_calc_normals_poly_and_vertex_accum_fn( - void *__restrict userdata, const int pidx, const TaskParallelTLS *__restrict UNUSED(tls)) +static void mesh_calc_normals_poly_and_vertex_accum_fn(void *__restrict userdata, + const int pidx, + const TaskParallelTLS *__restrict /*tls*/) { const MeshCalcNormalsData_PolyAndVertex *data = (MeshCalcNormalsData_PolyAndVertex *)userdata; const MPoly *mp = &data->mpoly[pidx]; @@ -294,7 +295,7 @@ static void mesh_calc_normals_poly_and_vertex_accum_fn( } static void mesh_calc_normals_poly_and_vertex_finalize_fn( - void *__restrict userdata, const int vidx, const TaskParallelTLS *__restrict UNUSED(tls)) + void *__restrict userdata, const int vidx, const TaskParallelTLS *__restrict /*tls*/) { MeshCalcNormalsData_PolyAndVertex *data = (MeshCalcNormalsData_PolyAndVertex *)userdata; @@ -310,7 +311,7 @@ static void mesh_calc_normals_poly_and_vertex_finalize_fn( void BKE_mesh_calc_normals_poly_and_vertex(const MVert *mvert, const int mvert_len, const MLoop *mloop, - const int UNUSED(mloop_len), + const int /*mloop_len*/, const MPoly *mpoly, const int mpoly_len, float (*r_poly_normals)[3], @@ -945,7 +946,7 @@ static void mesh_edges_sharp_tag(LoopSplitTaskDataCommon *data, } void BKE_edges_sharp_from_angle_set(const struct MVert *mverts, - const int UNUSED(numVerts), + const int /*numVerts*/, struct MEdge *medges, const int numEdges, const struct MLoop *mloops, @@ -1606,7 +1607,7 @@ static void loop_split_generator(TaskPool *pool, LoopSplitTaskDataCommon *common void BKE_mesh_normals_loop_split(const MVert *mverts, const float (*vert_normals)[3], - const int UNUSED(numVerts), + const int /*numVerts*/, const MEdge *medges, const int numEdges, const MLoop *mloops, diff --git a/source/blender/blenkernel/intern/mesh_runtime.cc b/source/blender/blenkernel/intern/mesh_runtime.cc index 062d6cdb952..bd9f8242274 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.cc +++ b/source/blender/blenkernel/intern/mesh_runtime.cc @@ -78,7 +78,7 @@ void BKE_mesh_runtime_free_data(Mesh *mesh) mesh_runtime_free_mutexes(mesh); } -void BKE_mesh_runtime_reset_on_copy(Mesh *mesh, const int UNUSED(flag)) +void BKE_mesh_runtime_reset_on_copy(Mesh *mesh, const int /*flag*/) { Mesh_Runtime *runtime = &mesh->runtime; diff --git a/source/blender/blenkernel/intern/mesh_tangent.cc b/source/blender/blenkernel/intern/mesh_tangent.cc index 7c12e15ca7b..07b45cf376d 100644 --- a/source/blender/blenkernel/intern/mesh_tangent.cc +++ b/source/blender/blenkernel/intern/mesh_tangent.cc @@ -77,12 +77,12 @@ struct BKEMeshToTangent { }; void BKE_mesh_calc_loop_tangent_single_ex(const MVert *mverts, - const int UNUSED(numVerts), + const int /*numVerts*/, const MLoop *mloops, float (*r_looptangent)[4], const float (*loopnors)[3], const MLoopUV *loopuvs, - const int UNUSED(numLoops), + const int /*numLoops*/, const MPoly *mpolys, const int numPolys, ReportList *reports) @@ -298,7 +298,7 @@ struct SGLSLMeshToTangent { #endif }; -static void DM_calc_loop_tangents_thread(TaskPool *__restrict UNUSED(pool), void *taskdata) +static void DM_calc_loop_tangents_thread(TaskPool *__restrict /*pool*/, void *taskdata) { SGLSLMeshToTangent *mesh_data = static_cast(taskdata); diff --git a/source/blender/blenkernel/intern/mesh_tessellate.cc b/source/blender/blenkernel/intern/mesh_tessellate.cc index 88f78197566..df83743634c 100644 --- a/source/blender/blenkernel/intern/mesh_tessellate.cc +++ b/source/blender/blenkernel/intern/mesh_tessellate.cc @@ -263,7 +263,7 @@ static void mesh_calc_tessellation_for_face_with_normal_fn(void *__restrict user data->poly_normals[index]); } -static void mesh_calc_tessellation_for_face_free_fn(const void *__restrict UNUSED(userdata), +static void mesh_calc_tessellation_for_face_free_fn(const void *__restrict /*userdata*/, void *__restrict tls_v) { TessellationUserTLS *tls_data = static_cast(tls_v); @@ -275,7 +275,7 @@ static void mesh_calc_tessellation_for_face_free_fn(const void *__restrict UNUSE static void mesh_recalc_looptri__multi_threaded(const MLoop *mloop, const MPoly *mpoly, const MVert *mvert, - int UNUSED(totloop), + int /*totloop*/, int totpoly, MLoopTri *mlooptri, const float (*poly_normals)[3]) diff --git a/source/blender/blenkernel/intern/mesh_validate.cc b/source/blender/blenkernel/intern/mesh_validate.cc index 95f885c45dd..9b140171912 100644 --- a/source/blender/blenkernel/intern/mesh_validate.cc +++ b/source/blender/blenkernel/intern/mesh_validate.cc @@ -1361,13 +1361,13 @@ static int vergedgesort(const void *v1, const void *v2) /* Create edges based on known verts and faces, * this function is only used when loading very old blend files */ -static void mesh_calc_edges_mdata(const MVert *UNUSED(allvert), +static void mesh_calc_edges_mdata(const MVert * /*allvert*/, const MFace *allface, MLoop *allloop, const MPoly *allpoly, - int UNUSED(totvert), + int /*totvert*/, int totface, - int UNUSED(totloop), + int /*totloop*/, int totpoly, const bool use_old, MEdge **r_medge, diff --git a/source/blender/blenkernel/intern/modifier.cc b/source/blender/blenkernel/intern/modifier.cc index 19c5499d058..2f8a02fa516 100644 --- a/source/blender/blenkernel/intern/modifier.cc +++ b/source/blender/blenkernel/intern/modifier.cc @@ -165,8 +165,8 @@ ModifierData *BKE_modifier_new(int type) return md; } -static void modifier_free_data_id_us_cb(void *UNUSED(userData), - Object *UNUSED(ob), +static void modifier_free_data_id_us_cb(void * /*userData*/, + Object * /*ob*/, ID **idpoin, int cb_flag) { @@ -336,7 +336,7 @@ ModifierData *BKE_modifier_copy_ex(const ModifierData *md, int flag) void BKE_modifier_copydata_generic(const ModifierData *md_src, ModifierData *md_dst, - const int UNUSED(flag)) + const int /*flag*/) { const ModifierTypeInfo *mti = BKE_modifier_get_info(ModifierType(md_src->type)); @@ -356,8 +356,8 @@ void BKE_modifier_copydata_generic(const ModifierData *md_src, md_dst->runtime = nullptr; } -static void modifier_copy_data_id_us_cb(void *UNUSED(userData), - Object *UNUSED(ob), +static void modifier_copy_data_id_us_cb(void * /*userData*/, + Object * /*ob*/, ID **idpoin, int cb_flag) { diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 959093b73b8..039bb1bf7f3 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -118,7 +118,7 @@ static void ntree_set_typeinfo(bNodeTree *ntree, bNodeTreeType *typeinfo); static void node_socket_copy(bNodeSocket *sock_dst, const bNodeSocket *sock_src, const int flag); static void free_localized_node_groups(bNodeTree *ntree); static void node_free_node(bNodeTree *ntree, bNode *node); -static void node_socket_interface_free(bNodeTree *UNUSED(ntree), +static void node_socket_interface_free(bNodeTree * /*ntree*/, bNodeSocket *sock, const bool do_id_user); @@ -129,7 +129,7 @@ static void ntree_init_data(ID *id) ntree_set_typeinfo(ntree, nullptr); } -static void ntree_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src, const int flag) +static void ntree_copy_data(Main * /*bmain*/, ID *id_dst, const ID *id_src, const int flag) { bNodeTree *ntree_dst = (bNodeTree *)id_dst; const bNodeTree *ntree_src = (const bNodeTree *)id_src; @@ -1533,7 +1533,7 @@ static bool unique_identifier_check(void *arg, const char *identifier) } static bNodeSocket *make_socket(bNodeTree *ntree, - bNode *UNUSED(node), + bNode * /*node*/, int in_out, ListBase *lb, const char *idname, @@ -1676,7 +1676,7 @@ static bool socket_id_user_decrement(bNodeSocket *sock) } void nodeModifySocketType(bNodeTree *ntree, - bNode *UNUSED(node), + bNode * /*node*/, bNodeSocket *sock, const char *idname) { @@ -1895,7 +1895,7 @@ const char *nodeStaticSocketInterfaceType(int type, int subtype) return nullptr; } -const char *nodeStaticSocketLabel(int type, int UNUSED(subtype)) +const char *nodeStaticSocketLabel(int type, int /*subtype*/) { switch (type) { case SOCK_FLOAT: @@ -2652,7 +2652,7 @@ bNodeTree *ntreeAddTree(Main *bmain, const char *name, const char *idname) return ntreeAddTree_do(bmain, nullptr, false, name, idname); } -bNodeTree *ntreeAddTreeEmbedded(Main *UNUSED(bmain), +bNodeTree *ntreeAddTreeEmbedded(Main * /*bmain*/, ID *owner_id, const char *name, const char *idname) @@ -3034,7 +3034,7 @@ void nodeRemoveNode(Main *bmain, bNodeTree *ntree, bNode *node, bool do_id_user) node_free_node(ntree, node); } -static void node_socket_interface_free(bNodeTree *UNUSED(ntree), +static void node_socket_interface_free(bNodeTree * /*ntree*/, bNodeSocket *sock, const bool do_id_user) { @@ -3405,7 +3405,7 @@ static void ntree_interface_identifier_base(bNodeTree *ntree, char *base) } /* check if the identifier is already in use */ -static bool ntree_interface_unique_identifier_check(void *UNUSED(data), const char *identifier) +static bool ntree_interface_unique_identifier_check(void * /*data*/, const char *identifier) { return (RNA_struct_find(identifier) != nullptr); } @@ -3679,7 +3679,7 @@ void nodeSocketDeclarationsUpdate(bNode *node) update_socket_declarations(&node->outputs, node->runtime->declaration->outputs()); } -bool nodeDeclarationEnsureOnOutdatedNode(bNodeTree *UNUSED(ntree), bNode *node) +bool nodeDeclarationEnsureOnOutdatedNode(bNodeTree * /*ntree*/, bNode *node) { if (node->runtime->declaration != nullptr) { return false; @@ -3978,7 +3978,7 @@ void BKE_node_instance_hash_clear_tags(bNodeInstanceHash *hash) } } -void BKE_node_instance_hash_tag(bNodeInstanceHash *UNUSED(hash), void *value) +void BKE_node_instance_hash_tag(bNodeInstanceHash * /*hash*/, void *value) { bNodeInstanceHashEntry *entry = (bNodeInstanceHashEntry *)value; entry->tag = 1; @@ -4184,9 +4184,9 @@ static void node_type_base_defaults(bNodeType *ntype) } /* allow this node for any tree type */ -static bool node_poll_default(bNodeType *UNUSED(ntype), - bNodeTree *UNUSED(ntree), - const char **UNUSED(disabled_hint)) +static bool node_poll_default(bNodeType * /*ntype*/, + bNodeTree * /*ntree*/, + const char ** /*disabled_hint*/) { return true; } @@ -4392,9 +4392,9 @@ void node_type_gpu(struct bNodeType *ntype, NodeGPUExecFunction gpu_fn) /* callbacks for undefined types */ -static bool node_undefined_poll(bNodeType *UNUSED(ntype), - bNodeTree *UNUSED(nodetree), - const char **UNUSED(r_disabled_hint)) +static bool node_undefined_poll(bNodeType * /*ntype*/, + bNodeTree * /*nodetree*/, + const char ** /*r_disabled_hint*/) { /* this type can not be added deliberately, it's just a placeholder */ return false; diff --git a/source/blender/blenkernel/intern/node_tree_update.cc b/source/blender/blenkernel/intern/node_tree_update.cc index 591e710dea2..707bb83a3bc 100644 --- a/source/blender/blenkernel/intern/node_tree_update.cc +++ b/source/blender/blenkernel/intern/node_tree_update.cc @@ -1679,12 +1679,12 @@ void BKE_ntree_update_tag_link_removed(bNodeTree *ntree) add_tree_tag(ntree, NTREE_CHANGED_LINK); } -void BKE_ntree_update_tag_link_added(bNodeTree *ntree, bNodeLink *UNUSED(link)) +void BKE_ntree_update_tag_link_added(bNodeTree *ntree, bNodeLink * /*link*/) { add_tree_tag(ntree, NTREE_CHANGED_LINK); } -void BKE_ntree_update_tag_link_mute(bNodeTree *ntree, bNodeLink *UNUSED(link)) +void BKE_ntree_update_tag_link_mute(bNodeTree *ntree, bNodeLink * /*link*/) { add_tree_tag(ntree, NTREE_CHANGED_LINK); } @@ -1717,7 +1717,7 @@ void BKE_ntree_update_tag_id_changed(Main *bmain, ID *id) FOREACH_NODETREE_END; } -void BKE_ntree_update_tag_image_user_changed(bNodeTree *ntree, ImageUser *UNUSED(iuser)) +void BKE_ntree_update_tag_image_user_changed(bNodeTree *ntree, ImageUser * /*iuser*/) { /* Would have to search for the node that uses the image user for a more detailed tag. */ add_tree_tag(ntree, NTREE_CHANGED_ANY); diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index 20ba47efaa0..75da9f92f49 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -321,7 +321,7 @@ static void object_free_data(ID *id) } static void library_foreach_modifiersForeachIDLink(void *user_data, - Object *UNUSED(object), + Object * /*object*/, ID **id_pointer, int cb_flag) { @@ -331,7 +331,7 @@ static void library_foreach_modifiersForeachIDLink(void *user_data, } static void library_foreach_gpencil_modifiersForeachIDLink(void *user_data, - Object *UNUSED(object), + Object * /*object*/, ID **id_pointer, int cb_flag) { @@ -341,7 +341,7 @@ static void library_foreach_gpencil_modifiersForeachIDLink(void *user_data, } static void library_foreach_shaderfxForeachIDLink(void *user_data, - Object *UNUSED(object), + Object * /*object*/, ID **id_pointer, int cb_flag) { @@ -350,7 +350,7 @@ static void library_foreach_shaderfxForeachIDLink(void *user_data, data, BKE_lib_query_foreachid_process(data, id_pointer, cb_flag)); } -static void library_foreach_constraintObjectLooper(bConstraint *UNUSED(con), +static void library_foreach_constraintObjectLooper(bConstraint * /*con*/, ID **id_pointer, bool is_reference, void *user_data) @@ -361,7 +361,7 @@ static void library_foreach_constraintObjectLooper(bConstraint *UNUSED(con), data, BKE_lib_query_foreachid_process(data, id_pointer, cb_flag)); } -static void library_foreach_particlesystemsObjectLooper(ParticleSystem *UNUSED(psys), +static void library_foreach_particlesystemsObjectLooper(ParticleSystem * /*psys*/, ID **id_pointer, void *user_data, int cb_flag) @@ -1017,9 +1017,9 @@ static void expand_constraint_channels(BlendExpander *expander, ListBase *chanba } static void expand_object_expandModifiers(void *userData, - Object *UNUSED(ob), + Object * /*ob*/, ID **idpoin, - int UNUSED(cb_flag)) + int /*cb_flag*/) { BlendExpander *expander = (BlendExpander *)userData; BLO_expand(expander, *idpoin); @@ -4126,8 +4126,8 @@ struct GPencilStrokePointIterData { void *user_data; }; -static void foreach_display_point_gpencil_stroke_fn(bGPDlayer *UNUSED(layer), - bGPDframe *UNUSED(frame), +static void foreach_display_point_gpencil_stroke_fn(bGPDlayer * /*layer*/, + bGPDframe * /*frame*/, bGPDstroke *stroke, void *thunk) { @@ -5098,7 +5098,7 @@ void BKE_object_runtime_reset(Object *object) memset(&object->runtime, 0, sizeof(object->runtime)); } -void BKE_object_runtime_reset_on_copy(Object *object, const int UNUSED(flag)) +void BKE_object_runtime_reset_on_copy(Object *object, const int /*flag*/) { Object_Runtime *runtime = &object->runtime; runtime->data_eval = nullptr; diff --git a/source/blender/blenkernel/intern/object_update.cc b/source/blender/blenkernel/intern/object_update.cc index 19e15a169b9..5328d956cee 100644 --- a/source/blender/blenkernel/intern/object_update.cc +++ b/source/blender/blenkernel/intern/object_update.cc @@ -278,7 +278,7 @@ void BKE_object_sync_to_original(Depsgraph *depsgraph, Object *object) object_sync_boundbox_to_original(object_orig, object); } -void BKE_object_eval_uber_transform(Depsgraph *UNUSED(depsgraph), Object *UNUSED(object)) +void BKE_object_eval_uber_transform(Depsgraph * /*depsgraph*/, Object * /*object*/) { } diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index de4b6caa781..ea4360b1626 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/source/blender/blenkernel/intern/paint.cc @@ -89,10 +89,7 @@ static void palette_init_data(ID *id) id_fake_user_set(&palette->id); } -static void palette_copy_data(Main *UNUSED(bmain), - ID *id_dst, - const ID *id_src, - const int UNUSED(flag)) +static void palette_copy_data(Main * /*bmain*/, ID *id_dst, const ID *id_src, const int /*flag*/) { Palette *palette_dst = (Palette *)id_dst; const Palette *palette_src = (const Palette *)id_src; @@ -123,7 +120,7 @@ static void palette_blend_read_data(BlendDataReader *reader, ID *id) BLO_read_list(reader, &palette->colors); } -static void palette_undo_preserve(BlendLibReader *UNUSED(reader), ID *id_new, ID *id_old) +static void palette_undo_preserve(BlendLibReader * /*reader*/, ID *id_new, ID *id_old) { /* Whole Palette is preserved across undo-steps, and it has no extra pointer, simple. */ /* NOTE: We do not care about potential internal references to self here, Palette has none. */ @@ -163,10 +160,10 @@ IDTypeInfo IDType_ID_PAL = { /* lib_override_apply_post */ nullptr, }; -static void paint_curve_copy_data(Main *UNUSED(bmain), +static void paint_curve_copy_data(Main * /*bmain*/, ID *id_dst, const ID *id_src, - const int UNUSED(flag)) + const int /*flag*/) { PaintCurve *paint_curve_dst = (PaintCurve *)id_dst; const PaintCurve *paint_curve_src = (const PaintCurve *)id_src; @@ -2306,7 +2303,7 @@ void BKE_sculpt_bvh_update_from_ccg(PBVH *pbvh, SubdivCCG *subdiv_ccg) subdiv_ccg->grid_hidden); } -bool BKE_sculptsession_use_pbvh_draw(const Object *ob, const View3D *UNUSED(v3d)) +bool BKE_sculptsession_use_pbvh_draw(const Object *ob, const View3D * /*v3d*/) { SculptSession *ss = ob->sculpt; if (ss == nullptr || ss->pbvh == nullptr || ss->mode_type != OB_MODE_SCULPT) { diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc index f733f3145ec..df616d4e087 100644 --- a/source/blender/blenkernel/intern/pbvh_pixels.cc +++ b/source/blender/blenkernel/intern/pbvh_pixels.cc @@ -114,7 +114,7 @@ struct EncodePixelsUserData { static void do_encode_pixels(void *__restrict userdata, const int n, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { EncodePixelsUserData *data = static_cast(userdata); Image *image = data->image; diff --git a/source/blender/blenkernel/intern/pointcloud.cc b/source/blender/blenkernel/intern/pointcloud.cc index 5c935bf6daf..c73bbb91965 100644 --- a/source/blender/blenkernel/intern/pointcloud.cc +++ b/source/blender/blenkernel/intern/pointcloud.cc @@ -70,7 +70,7 @@ static void pointcloud_init_data(ID *id) POINTCLOUD_ATTR_POSITION); } -static void pointcloud_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src, const int flag) +static void pointcloud_copy_data(Main * /*bmain*/, ID *id_dst, const ID *id_src, const int flag) { PointCloud *pointcloud_dst = (PointCloud *)id_dst; const PointCloud *pointcloud_src = (const PointCloud *)id_src; @@ -339,7 +339,7 @@ BoundBox *BKE_pointcloud_boundbox_get(Object *ob) return ob->runtime.bb; } -bool BKE_pointcloud_attribute_required(const PointCloud *UNUSED(pointcloud), const char *name) +bool BKE_pointcloud_attribute_required(const PointCloud * /*pointcloud*/, const char *name) { return STREQ(name, POINTCLOUD_ATTR_POSITION); } diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index 2489c64ba0a..d6183210186 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -457,7 +457,7 @@ static void scene_free_data(ID *id) BLI_assert(scene->layer_properties == nullptr); } -static void scene_foreach_rigidbodyworldSceneLooper(struct RigidBodyWorld *UNUSED(rbw), +static void scene_foreach_rigidbodyworldSceneLooper(struct RigidBodyWorld * /*rbw*/, ID **id_pointer, void *user_data, int cb_flag) @@ -1691,7 +1691,7 @@ static void scene_undo_preserve(BlendLibReader *reader, ID *id_new, ID *id_old) } } -static void scene_lib_override_apply_post(ID *id_dst, ID *UNUSED(id_src)) +static void scene_lib_override_apply_post(ID *id_dst, ID * /*id_src*/) { Scene *scene = (Scene *)id_dst; @@ -2637,7 +2637,7 @@ void BKE_scene_update_sound(Depsgraph *depsgraph, Main *bmain) BKE_sound_update_scene(depsgraph, scene); } -void BKE_scene_update_tag_audio_volume(Depsgraph *UNUSED(depsgraph), Scene *scene) +void BKE_scene_update_tag_audio_volume(Depsgraph * /*depsgraph*/, Scene *scene) { BLI_assert(DEG_is_evaluated_id(&scene->id)); /* The volume is actually updated in BKE_scene_update_sound(), from either diff --git a/source/blender/blenkernel/intern/simulation.cc b/source/blender/blenkernel/intern/simulation.cc index 9d4d6a4e350..f399becfa89 100644 --- a/source/blender/blenkernel/intern/simulation.cc +++ b/source/blender/blenkernel/intern/simulation.cc @@ -167,8 +167,8 @@ void *BKE_simulation_add(Main *bmain, const char *name) return simulation; } -void BKE_simulation_data_update(Depsgraph *UNUSED(depsgraph), - Scene *UNUSED(scene), - Simulation *UNUSED(simulation)) +void BKE_simulation_data_update(Depsgraph * /*depsgraph*/, + Scene * /*scene*/, + Simulation * /*simulation*/) { } diff --git a/source/blender/blenkernel/intern/subdiv_mesh.cc b/source/blender/blenkernel/intern/subdiv_mesh.cc index 14695718804..de76de9606b 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.cc +++ b/source/blender/blenkernel/intern/subdiv_mesh.cc @@ -514,7 +514,7 @@ static bool subdiv_mesh_topology_info(const SubdivForeachContext *foreach_contex const int num_edges, const int num_loops, const int num_polygons, - const int *UNUSED(subdiv_polygon_offset)) + const int * /*subdiv_polygon_offset*/) { /* Multi-resolution grid data will be applied or become invalid after subdivision, * so don't try to preserve it and use memory. Crease values should also not be interpolated. */ @@ -626,7 +626,7 @@ static void evaluate_vertex_and_apply_displacement_interpolate( static void subdiv_mesh_vertex_displacement_every_corner_or_edge( const SubdivForeachContext *foreach_context, - void *UNUSED(tls), + void * /*tls*/, const int ptex_face_index, const float u, const float v, @@ -643,9 +643,9 @@ static void subdiv_mesh_vertex_displacement_every_corner( const int ptex_face_index, const float u, const float v, - const int UNUSED(coarse_vertex_index), - const int UNUSED(coarse_poly_index), - const int UNUSED(coarse_corner), + const int /*coarse_vertex_index*/, + const int /*coarse_poly_index*/, + const int /*coarse_corner*/, const int subdiv_vertex_index) { subdiv_mesh_vertex_displacement_every_corner_or_edge( @@ -657,9 +657,9 @@ static void subdiv_mesh_vertex_displacement_every_edge(const SubdivForeachContex const int ptex_face_index, const float u, const float v, - const int UNUSED(coarse_edge_index), - const int UNUSED(coarse_poly_index), - const int UNUSED(coarse_corner), + const int /*coarse_edge_index*/, + const int /*coarse_poly_index*/, + const int /*coarse_corner*/, const int subdiv_vertex_index) { subdiv_mesh_vertex_displacement_every_corner_or_edge( @@ -667,13 +667,13 @@ static void subdiv_mesh_vertex_displacement_every_edge(const SubdivForeachContex } static void subdiv_mesh_vertex_corner(const SubdivForeachContext *foreach_context, - void *UNUSED(tls), + void * /*tls*/, const int ptex_face_index, const float u, const float v, const int coarse_vertex_index, - const int UNUSED(coarse_poly_index), - const int UNUSED(coarse_corner), + const int /*coarse_poly_index*/, + const int /*coarse_corner*/, const int subdiv_vertex_index) { BLI_assert(coarse_vertex_index != ORIGINDEX_NONE); @@ -717,7 +717,7 @@ static void subdiv_mesh_vertex_edge(const SubdivForeachContext *foreach_context, const int ptex_face_index, const float u, const float v, - const int UNUSED(coarse_edge_index), + const int /*coarse_edge_index*/, const int coarse_poly_index, const int coarse_corner, const int subdiv_vertex_index) @@ -808,10 +808,10 @@ static void subdiv_copy_edge_data(SubdivMeshContext *ctx, } static void subdiv_mesh_edge(const SubdivForeachContext *foreach_context, - void *UNUSED(tls), + void * /*tls*/, const int coarse_edge_index, const int subdiv_edge_index, - const bool UNUSED(is_loose), + const bool /*is_loose*/, const int subdiv_v1, const int subdiv_v2) { @@ -902,7 +902,7 @@ static void subdiv_mesh_loop(const SubdivForeachContext *foreach_context, const int ptex_face_index, const float u, const float v, - const int UNUSED(coarse_loop_index), + const int /*coarse_loop_index*/, const int coarse_poly_index, const int coarse_corner, const int subdiv_loop_index, @@ -938,7 +938,7 @@ static void subdiv_copy_poly_data(const SubdivMeshContext *ctx, } static void subdiv_mesh_poly(const SubdivForeachContext *foreach_context, - void *UNUSED(tls), + void * /*tls*/, const int coarse_poly_index, const int subdiv_poly_index, const int start_loop_index, @@ -960,7 +960,7 @@ static void subdiv_mesh_poly(const SubdivForeachContext *foreach_context, * \{ */ static void subdiv_mesh_vertex_loose(const SubdivForeachContext *foreach_context, - void *UNUSED(tls), + void * /*tls*/, const int coarse_vertex_index, const int subdiv_vertex_index) { @@ -1098,7 +1098,7 @@ static void subdiv_mesh_vertex_of_loose_edge_interpolate(SubdivMeshContext *ctx, } static void subdiv_mesh_vertex_of_loose_edge(const SubdivForeachContext *foreach_context, - void *UNUSED(tls), + void * /*tls*/, const int coarse_edge_index, const float u, const int subdiv_vertex_index) diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 6418523a614..7c54b4d3f2f 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -363,7 +363,7 @@ struct VolumeGrid { is_loaded = false; } - void clear_reference(const char *UNUSED(volume_name)) + void clear_reference(const char * /*volume_name*/) { /* Clear any reference to a grid in the file cache. */ local_grid = grid()->copyGridWithNewTree(); @@ -515,10 +515,7 @@ static void volume_init_data(ID *id) BLI_strncpy(volume->velocity_grid, "velocity", sizeof(volume->velocity_grid)); } -static void volume_copy_data(Main *UNUSED(bmain), - ID *id_dst, - const ID *id_src, - const int UNUSED(flag)) +static void volume_copy_data(Main * /*bmain*/, ID *id_dst, const ID *id_src, const int /*flag*/) { Volume *volume_dst = (Volume *)id_dst; const Volume *volume_src = (const Volume *)id_src; diff --git a/source/blender/blenlib/BLI_allocator.hh b/source/blender/blenlib/BLI_allocator.hh index 149dda5a50e..db3caf2eeb7 100644 --- a/source/blender/blenlib/BLI_allocator.hh +++ b/source/blender/blenlib/BLI_allocator.hh @@ -63,7 +63,7 @@ class RawAllocator { }; public: - void *allocate(size_t size, size_t alignment, const char *UNUSED(name)) + void *allocate(size_t size, size_t alignment, const char * /*name*/) { BLI_assert(is_power_of_2_i(int(alignment))); void *ptr = malloc(size + alignment + sizeof(MemHead)); diff --git a/source/blender/blenlib/BLI_generic_virtual_array.hh b/source/blender/blenlib/BLI_generic_virtual_array.hh index 9545eaf9622..e8a27cea6d8 100644 --- a/source/blender/blenlib/BLI_generic_virtual_array.hh +++ b/source/blender/blenlib/BLI_generic_virtual_array.hh @@ -78,7 +78,7 @@ class GVMutableArrayImpl : public GVArrayImpl { namespace detail { struct GVArrayAnyExtraInfo { const GVArrayImpl *(*get_varray)(const void *buffer) = - [](const void *UNUSED(buffer)) -> const GVArrayImpl * { return nullptr; }; + [](const void * /*buffer*/) -> const GVArrayImpl * { return nullptr; }; template static constexpr GVArrayAnyExtraInfo get(); }; diff --git a/source/blender/blenlib/BLI_generic_virtual_vector_array.hh b/source/blender/blenlib/BLI_generic_virtual_vector_array.hh index 364b1ab33c7..373d010d926 100644 --- a/source/blender/blenlib/BLI_generic_virtual_vector_array.hh +++ b/source/blender/blenlib/BLI_generic_virtual_vector_array.hh @@ -133,8 +133,8 @@ class GVVectorArray_For_SingleGSpan : public GVVectorArray { } protected: - int64_t get_vector_size_impl(int64_t UNUSED(index)) const override; - void get_vector_element_impl(int64_t UNUSED(index), + int64_t get_vector_size_impl(int64_t /*index*/) const override; + void get_vector_element_impl(int64_t /*index*/, int64_t index_in_vector, void *r_value) const override; diff --git a/source/blender/blenlib/BLI_map.hh b/source/blender/blenlib/BLI_map.hh index 9fc5614c189..6d281420c47 100644 --- a/source/blender/blenlib/BLI_map.hh +++ b/source/blender/blenlib/BLI_map.hh @@ -1332,7 +1332,7 @@ template class StdUnorderedMapWrapper { map_.clear(); } - void print_stats(StringRef UNUSED(name) = "") const + void print_stats(StringRef /*name*/ = "") const { } }; diff --git a/source/blender/blenlib/BLI_map_slots.hh b/source/blender/blenlib/BLI_map_slots.hh index 6426216913f..eb2c1a7f5cf 100644 --- a/source/blender/blenlib/BLI_map_slots.hh +++ b/source/blender/blenlib/BLI_map_slots.hh @@ -169,7 +169,7 @@ template class SimpleMapSlot { * key. The hash can be used by other slot implementations to determine inequality faster. */ template - bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t UNUSED(hash)) const + bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t /*hash*/) const { if (state_ == Occupied) { return is_equal(key, *key_buffer_); @@ -194,7 +194,7 @@ template class SimpleMapSlot { * Change the state of this slot from empty/removed to occupied. The value is assumed to be * constructed already. */ - template void occupy_no_value(ForwardKey &&key, uint64_t UNUSED(hash)) + template void occupy_no_value(ForwardKey &&key, uint64_t /*hash*/) { BLI_assert(!this->is_occupied()); try { @@ -295,7 +295,7 @@ template class IntrusiveMapSlot } template - bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t UNUSED(hash)) const + bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t /*hash*/) const { BLI_assert(KeyInfo::is_not_empty_or_removed(key)); return is_equal(key, key_); @@ -310,7 +310,7 @@ template class IntrusiveMapSlot this->occupy_no_value(std::forward(key), hash); } - template void occupy_no_value(ForwardKey &&key, uint64_t UNUSED(hash)) + template void occupy_no_value(ForwardKey &&key, uint64_t /*hash*/) { BLI_assert(!this->is_occupied()); BLI_assert(KeyInfo::is_not_empty_or_removed(key)); diff --git a/source/blender/blenlib/BLI_set_slots.hh b/source/blender/blenlib/BLI_set_slots.hh index 805c194ac90..8ef49e0a2d0 100644 --- a/source/blender/blenlib/BLI_set_slots.hh +++ b/source/blender/blenlib/BLI_set_slots.hh @@ -129,7 +129,7 @@ template class SimpleSetSlot { * key. The hash is used by other slot implementations to determine inequality faster. */ template - bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t UNUSED(hash)) const + bool contains(const ForwardKey &key, const IsEqual &is_equal, uint64_t /*hash*/) const { if (state_ == Occupied) { return is_equal(key, *key_buffer_); @@ -141,7 +141,7 @@ template class SimpleSetSlot { * Change the state of this slot from empty/removed to occupied. The key has to be constructed * by calling the constructor with the given key as parameter. */ - template void occupy(ForwardKey &&key, uint64_t UNUSED(hash)) + template void occupy(ForwardKey &&key, uint64_t /*hash*/) { BLI_assert(!this->is_occupied()); new (&key_buffer_) Key(std::forward(key)); @@ -226,7 +226,7 @@ template class HashedSetSlot { return state_ == Empty; } - template uint64_t get_hash(const Hash &UNUSED(hash)) const + template uint64_t get_hash(const Hash & /*hash*/) const { BLI_assert(this->is_occupied()); return hash_; @@ -306,13 +306,13 @@ template class IntrusiveSetSlot { } template - bool contains(const ForwardKey &key, const IsEqual &is_equal, const uint64_t UNUSED(hash)) const + bool contains(const ForwardKey &key, const IsEqual &is_equal, const uint64_t /*hash*/) const { BLI_assert(KeyInfo::is_not_empty_or_removed(key)); return is_equal(key_, key); } - template void occupy(ForwardKey &&key, const uint64_t UNUSED(hash)) + template void occupy(ForwardKey &&key, const uint64_t /*hash*/) { BLI_assert(!this->is_occupied()); BLI_assert(KeyInfo::is_not_empty_or_removed(key)); diff --git a/source/blender/blenlib/BLI_vector_set_slots.hh b/source/blender/blenlib/BLI_vector_set_slots.hh index 35dedd57705..cc7f5d1ff1e 100644 --- a/source/blender/blenlib/BLI_vector_set_slots.hh +++ b/source/blender/blenlib/BLI_vector_set_slots.hh @@ -73,7 +73,7 @@ template class SimpleVectorSetSlot { template bool contains(const ForwardKey &key, const IsEqual &is_equal, - uint64_t UNUSED(hash), + uint64_t /*hash*/, const Key *keys) const { if (state_ >= 0) { @@ -86,7 +86,7 @@ template class SimpleVectorSetSlot { * Change the state of this slot from empty/removed to occupied. The hash can be used by other * slot implementations. */ - void occupy(int64_t index, uint64_t UNUSED(hash)) + void occupy(int64_t index, uint64_t /*hash*/) { BLI_assert(!this->is_occupied()); state_ = index; diff --git a/source/blender/blenlib/BLI_virtual_array.hh b/source/blender/blenlib/BLI_virtual_array.hh index 217c8c00d66..36f5065c022 100644 --- a/source/blender/blenlib/BLI_virtual_array.hh +++ b/source/blender/blenlib/BLI_virtual_array.hh @@ -155,7 +155,7 @@ template class VArrayImpl { * arrays in all cases. * Return true when the virtual array was assigned and false when nothing was done. */ - virtual bool try_assign_GVArray(GVArray &UNUSED(varray)) const + virtual bool try_assign_GVArray(GVArray & /*varray*/) const { return false; } @@ -164,7 +164,7 @@ template class VArrayImpl { * Return true when the other virtual array should be considered to be the same, e.g. because it * shares the same underlying memory. */ - virtual bool is_same(const VArrayImpl &UNUSED(other)) const + virtual bool is_same(const VArrayImpl & /*other*/) const { return false; } @@ -201,7 +201,7 @@ template class VMutableArrayImpl : public VArrayImpl { /** * Similar to #VArrayImpl::try_assign_GVArray but for mutable virtual arrays. */ - virtual bool try_assign_GVMutableArray(GVMutableArray &UNUSED(varray)) const + virtual bool try_assign_GVMutableArray(GVMutableArray & /*varray*/) const { return false; } @@ -346,7 +346,7 @@ template class VArrayImpl_For_Single final : public VArrayImpl { } protected: - T get(const int64_t UNUSED(index)) const override + T get(const int64_t /*index*/) const override { return value_; } diff --git a/source/blender/blenlib/intern/delaunay_2d.cc b/source/blender/blenlib/intern/delaunay_2d.cc index 6280fe1010f..afecf9ea838 100644 --- a/source/blender/blenlib/intern/delaunay_2d.cc +++ b/source/blender/blenlib/intern/delaunay_2d.cc @@ -45,7 +45,7 @@ template<> double math_abs(const double v) return fabs(v); } -template double math_to_double(const T UNUSED(v)) +template double math_to_double(const T /*v*/) { BLI_assert(false); /* Need implementation for other type. */ return 0.0; @@ -2645,7 +2645,7 @@ void prepare_cdt_for_output(CDT_state *cdt_state, const CDT_output_type outpu template CDT_result get_cdt_output(CDT_state *cdt_state, - const CDT_input UNUSED(input), + const CDT_input /*input*/, CDT_output_type output_type) { CDT_output_type oty = output_type; diff --git a/source/blender/blenlib/intern/generic_virtual_array.cc b/source/blender/blenlib/intern/generic_virtual_array.cc index f66b1e14fc6..b0623175dc7 100644 --- a/source/blender/blenlib/intern/generic_virtual_array.cc +++ b/source/blender/blenlib/intern/generic_virtual_array.cc @@ -51,7 +51,7 @@ CommonVArrayInfo GVArrayImpl::common_info() const return {}; } -bool GVArrayImpl::try_assign_VArray(void *UNUSED(varray)) const +bool GVArrayImpl::try_assign_VArray(void * /*varray*/) const { return false; } @@ -102,7 +102,7 @@ void GVMutableArray::fill(const void *value) } } -bool GVMutableArrayImpl::try_assign_VMutableArray(void *UNUSED(varray)) const +bool GVMutableArrayImpl::try_assign_VMutableArray(void * /*varray*/) const { return false; } @@ -172,11 +172,11 @@ void GVArrayImpl_For_GSpan::materialize_compressed_to_uninitialized(const IndexM /* Generic virtual array where each element has the same value. The value is not owned. */ -void GVArrayImpl_For_SingleValueRef::get(const int64_t UNUSED(index), void *r_value) const +void GVArrayImpl_For_SingleValueRef::get(const int64_t /*index*/, void *r_value) const { type_->copy_assign(value_, r_value); } -void GVArrayImpl_For_SingleValueRef::get_to_uninitialized(const int64_t UNUSED(index), +void GVArrayImpl_For_SingleValueRef::get_to_uninitialized(const int64_t /*index*/, void *r_value) const { type_->copy_construct(value_, r_value); @@ -261,11 +261,11 @@ template class GVArrayImpl_For_SmallTrivialSingleValue : public } private: - void get(const int64_t UNUSED(index), void *r_value) const override + void get(const int64_t /*index*/, void *r_value) const override { this->copy_value_to(r_value); } - void get_to_uninitialized(const int64_t UNUSED(index), void *r_value) const override + void get_to_uninitialized(const int64_t /*index*/, void *r_value) const override { this->copy_value_to(r_value); } diff --git a/source/blender/blenlib/intern/generic_virtual_vector_array.cc b/source/blender/blenlib/intern/generic_virtual_vector_array.cc index 8fd1fb50b72..5d6985e16c8 100644 --- a/source/blender/blenlib/intern/generic_virtual_vector_array.cc +++ b/source/blender/blenlib/intern/generic_virtual_vector_array.cc @@ -16,12 +16,12 @@ void GVArray_For_GVVectorArrayIndex::get_to_uninitialized(const int64_t index_in vector_array_.get_vector_element(index_, index_in_vector, r_value); } -int64_t GVVectorArray_For_SingleGVArray::get_vector_size_impl(const int64_t UNUSED(index)) const +int64_t GVVectorArray_For_SingleGVArray::get_vector_size_impl(const int64_t /*index*/) const { return varray_.size(); } -void GVVectorArray_For_SingleGVArray::get_vector_element_impl(const int64_t UNUSED(index), +void GVVectorArray_For_SingleGVArray::get_vector_element_impl(const int64_t /*index*/, const int64_t index_in_vector, void *r_value) const { @@ -33,12 +33,12 @@ bool GVVectorArray_For_SingleGVArray::is_single_vector_impl() const return true; } -int64_t GVVectorArray_For_SingleGSpan::get_vector_size_impl(const int64_t UNUSED(index)) const +int64_t GVVectorArray_For_SingleGSpan::get_vector_size_impl(const int64_t /*index*/) const { return span_.size(); } -void GVVectorArray_For_SingleGSpan::get_vector_element_impl(const int64_t UNUSED(index), +void GVVectorArray_For_SingleGSpan::get_vector_element_impl(const int64_t /*index*/, const int64_t index_in_vector, void *r_value) const { diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc index 0d8ad1da582..3efe62d2984 100644 --- a/source/blender/blenlib/intern/mesh_boolean.cc +++ b/source/blender/blenlib/intern/mesh_boolean.cc @@ -2527,7 +2527,7 @@ class InsideShapeTestData { static void inside_shape_callback(void *userdata, int index, const BVHTreeRay *ray, - BVHTreeRayHit *UNUSED(hit)) + BVHTreeRayHit * /*hit*/) { const int dbg_level = 0; if (dbg_level > 0) { diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc index 7553898f5d3..ee29662698a 100644 --- a/source/blender/blenlib/intern/mesh_intersect.cc +++ b/source/blender/blenlib/intern/mesh_intersect.cc @@ -829,13 +829,13 @@ struct BBPadData { static void pad_face_bb_range_func(void *__restrict userdata, const int iter, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { BBPadData *pad_data = static_cast(userdata); (*pad_data->face_bounding_box)[iter].expand(pad_data->pad); } -static void calc_face_bb_reduce(const void *__restrict UNUSED(userdata), +static void calc_face_bb_reduce(const void *__restrict /*userdata*/, void *__restrict chunk_join, void *__restrict chunk) { @@ -2451,7 +2451,7 @@ class TriOverlaps { } private: - static bool only_different_shapes(void *userdata, int index_a, int index_b, int UNUSED(thread)) + static bool only_different_shapes(void *userdata, int index_a, int index_b, int /*thread*/) { CBData *cbdata = static_cast(userdata); return cbdata->tm.face(index_a)->orig != cbdata->tm.face(index_b)->orig; @@ -2487,7 +2487,7 @@ static std::pair canon_int_pair(int a, int b) static void calc_overlap_itts_range_func(void *__restrict userdata, const int iter, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { constexpr int dbg_level = 0; OverlapIttsData *data = static_cast(userdata); @@ -2682,7 +2682,7 @@ static CDT_data calc_cluster_subdivided(const CoplanarClusterInfo &clinfo, const IMesh &tm, const TriOverlaps &ov, const Map, ITT_value> &itt_map, - IMeshArena *UNUSED(arena)) + IMeshArena * /*arena*/) { constexpr int dbg_level = 0; BLI_assert(c < clinfo.tot_cluster()); @@ -2889,7 +2889,7 @@ static void degenerate_range_func(void *__restrict userdata, chunk_data->has_degenerate_tri |= is_degenerate; } -static void degenerate_reduce(const void *__restrict UNUSED(userdata), +static void degenerate_reduce(const void *__restrict /*userdata*/, void *__restrict chunk_join, void *__restrict chunk) { @@ -2931,7 +2931,7 @@ static IMesh remove_degenerate_tris(const IMesh &tm_in) IMesh trimesh_self_intersect(const IMesh &tm_in, IMeshArena *arena) { return trimesh_nary_intersect( - tm_in, 1, [](int UNUSED(t)) { return 0; }, true, arena); + tm_in, 1, [](int /*t*/) { return 0; }, true, arena); } IMesh trimesh_nary_intersect(const IMesh &tm_in, diff --git a/source/blender/blenlib/intern/task_graph.cc b/source/blender/blenlib/intern/task_graph.cc index 6c1cc818d75..5bc84bf7573 100644 --- a/source/blender/blenlib/intern/task_graph.cc +++ b/source/blender/blenlib/intern/task_graph.cc @@ -75,7 +75,7 @@ struct TaskNode { } #ifdef WITH_TBB - tbb::flow::continue_msg run(const tbb::flow::continue_msg UNUSED(input)) + tbb::flow::continue_msg run(const tbb::flow::continue_msg /*input*/) { run_func(task_data); return tbb::flow::continue_msg(); diff --git a/source/blender/blenlib/intern/task_range.cc b/source/blender/blenlib/intern/task_range.cc index 181b760bea1..20551aba93b 100644 --- a/source/blender/blenlib/intern/task_range.cc +++ b/source/blender/blenlib/intern/task_range.cc @@ -132,7 +132,7 @@ void BLI_task_parallel_range(const int start, } } -int BLI_task_parallel_thread_id(const TaskParallelTLS *UNUSED(tls)) +int BLI_task_parallel_thread_id(const TaskParallelTLS * /*tls*/) { #ifdef WITH_TBB /* Get a unique thread ID for texture nodes. In the future we should get rid diff --git a/source/blender/blenlib/tests/BLI_cpp_type_test.cc b/source/blender/blenlib/tests/BLI_cpp_type_test.cc index 6a59bedc649..5823d54f51b 100644 --- a/source/blender/blenlib/tests/BLI_cpp_type_test.cc +++ b/source/blender/blenlib/tests/BLI_cpp_type_test.cc @@ -63,7 +63,7 @@ struct TestType { return stream; } - friend bool operator==(const TestType &UNUSED(a), const TestType &UNUSED(b)) + friend bool operator==(const TestType & /*a*/, const TestType & /*b*/) { return false; } diff --git a/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc b/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc index adcfe7f5d2d..ca99c678754 100644 --- a/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc +++ b/source/blender/blenlib/tests/BLI_delaunay_2d_test.cc @@ -110,7 +110,7 @@ static int get_orig_index(const Array> &out_to_orig, int orig_index) return -1; } -template static double math_to_double(const T UNUSED(v)) +template static double math_to_double(const T /*v*/) { BLI_assert(false); /* Need implementation for other type. */ return 0.0; diff --git a/source/blender/blenlib/tests/BLI_map_test.cc b/source/blender/blenlib/tests/BLI_map_test.cc index 0ca07309836..69ae82d6f05 100644 --- a/source/blender/blenlib/tests/BLI_map_test.cc +++ b/source/blender/blenlib/tests/BLI_map_test.cc @@ -560,8 +560,8 @@ TEST(map, PopExceptions) TEST(map, AddOrModifyExceptions) { Map map; - auto create_fn = [](ExceptionThrower *UNUSED(v)) { throw std::runtime_error(""); }; - auto modify_fn = [](ExceptionThrower *UNUSED(v)) {}; + auto create_fn = [](ExceptionThrower * /*v*/) { throw std::runtime_error(""); }; + auto modify_fn = [](ExceptionThrower * /*v*/) {}; EXPECT_ANY_THROW({ map.add_or_modify(3, create_fn, modify_fn); }); } diff --git a/source/blender/blenlib/tests/BLI_memory_utils_test.cc b/source/blender/blenlib/tests/BLI_memory_utils_test.cc index ab716e5d011..939ac6151b0 100644 --- a/source/blender/blenlib/tests/BLI_memory_utils_test.cc +++ b/source/blender/blenlib/tests/BLI_memory_utils_test.cc @@ -20,7 +20,7 @@ struct MyValue { alive++; } - MyValue(const MyValue &UNUSED(other)) + MyValue(const MyValue & /*other*/) { if (alive == 15) { throw std::exception(); diff --git a/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc b/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc index fabc2412828..ea324534d78 100644 --- a/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc +++ b/source/blender/blenlib/tests/BLI_mesh_boolean_test.cc @@ -106,7 +106,7 @@ class IMeshBuilder { } }; -static int all_shape_zero(int UNUSED(t)) +static int all_shape_zero(int /*t*/) { return 0; } diff --git a/source/blender/blenlib/tests/BLI_task_test.cc b/source/blender/blenlib/tests/BLI_task_test.cc index a933d45e7cd..63bb767466f 100644 --- a/source/blender/blenlib/tests/BLI_task_test.cc +++ b/source/blender/blenlib/tests/BLI_task_test.cc @@ -27,7 +27,7 @@ static void task_range_iter_func(void *userdata, int index, const TaskParallelTL // printf("%d, %d, %d\n", index, data[index], *((int *)tls->userdata_chunk)); } -static void task_range_iter_reduce_func(const void *__restrict UNUSED(userdata), +static void task_range_iter_reduce_func(const void *__restrict /*userdata*/, void *__restrict join_v, void *__restrict userdata_chunk) { @@ -71,7 +71,7 @@ TEST(task, RangeIter) static void task_mempool_iter_func(void *userdata, MempoolIterData *item, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { int *data = (int *)item; int *count = (int *)userdata; @@ -147,7 +147,7 @@ using TaskMemPool_Chunk = struct TaskMemPool_Chunk { ListBase *accumulate_items; }; -static void task_mempool_iter_tls_func(void *UNUSED(userdata), +static void task_mempool_iter_tls_func(void * /*userdata*/, MempoolIterData *item, const TaskParallelTLS *__restrict tls) { @@ -165,7 +165,7 @@ static void task_mempool_iter_tls_func(void *UNUSED(userdata), BLI_addtail(task_data->accumulate_items, BLI_genericNodeN(data)); } -static void task_mempool_iter_tls_reduce(const void *__restrict UNUSED(userdata), +static void task_mempool_iter_tls_reduce(const void *__restrict /*userdata*/, void *__restrict chunk_join, void *__restrict chunk) { @@ -180,8 +180,7 @@ static void task_mempool_iter_tls_reduce(const void *__restrict UNUSED(userdata) } } -static void task_mempool_iter_tls_free(const void *UNUSED(userdata), - void *__restrict userdata_chunk) +static void task_mempool_iter_tls_free(const void * /*userdata*/, void *__restrict userdata_chunk) { TaskMemPool_Chunk *task_data = (TaskMemPool_Chunk *)userdata_chunk; MEM_freeN(task_data->accumulate_items); @@ -240,7 +239,7 @@ TEST(task, MempoolIterTLS) static void task_listbase_iter_func(void *userdata, void *item, int index, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { LinkData *data = (LinkData *)item; int *count = (int *)userdata; diff --git a/source/blender/blenlib/tests/BLI_vector_test.cc b/source/blender/blenlib/tests/BLI_vector_test.cc index c603f5dff27..29bf6c0cfb1 100644 --- a/source/blender/blenlib/tests/BLI_vector_test.cc +++ b/source/blender/blenlib/tests/BLI_vector_test.cc @@ -506,11 +506,11 @@ class TypeConstructMock { { } - TypeConstructMock(const TypeConstructMock &UNUSED(other)) : copy_constructed(true) + TypeConstructMock(const TypeConstructMock & /*other*/) : copy_constructed(true) { } - TypeConstructMock(TypeConstructMock &&UNUSED(other)) noexcept : move_constructed(true) + TypeConstructMock(TypeConstructMock && /*other*/) noexcept : move_constructed(true) { } diff --git a/source/blender/blenlib/tests/performance/BLI_task_performance_test.cc b/source/blender/blenlib/tests/performance/BLI_task_performance_test.cc index adebb1edb8b..68fdf4031ab 100644 --- a/source/blender/blenlib/tests/performance/BLI_task_performance_test.cc +++ b/source/blender/blenlib/tests/performance/BLI_task_performance_test.cc @@ -36,10 +36,10 @@ static uint gen_pseudo_random_number(uint num) /* *** Parallel iterations over double-linked list items. *** */ -static void task_listbase_light_iter_func(void *UNUSED(userdata), +static void task_listbase_light_iter_func(void * /*userdata*/, void *item, int index, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { LinkData *data = (LinkData *)item; @@ -50,7 +50,7 @@ static void task_listbase_light_iter_func(void *UNUSED(userdata), static void task_listbase_light_membarrier_iter_func(void *userdata, void *item, int index, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { LinkData *data = (LinkData *)item; @@ -60,10 +60,10 @@ static void task_listbase_light_membarrier_iter_func(void *userdata, atomic_sub_and_fetch_uint32((uint32_t *)count, 1); } -static void task_listbase_heavy_iter_func(void *UNUSED(userdata), +static void task_listbase_heavy_iter_func(void * /*userdata*/, void *item, int index, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { LinkData *data = (LinkData *)item; @@ -79,7 +79,7 @@ static void task_listbase_heavy_iter_func(void *UNUSED(userdata), static void task_listbase_heavy_membarrier_iter_func(void *userdata, void *item, int index, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { LinkData *data = (LinkData *)item; diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index fa9368db0d8..a527c16fa6e 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -921,7 +921,7 @@ BHead *blo_bhead_first(FileData *fd) return bhead; } -BHead *blo_bhead_prev(FileData *UNUSED(fd), BHead *thisblock) +BHead *blo_bhead_prev(FileData * /*fd*/, BHead *thisblock) { BHeadN *bheadn = BHEADN_FROM_BHEAD(thisblock); BHeadN *prev = bheadn->prev; @@ -1711,7 +1711,7 @@ typedef struct BLOCacheStorageValue { /** Register a cache data entry to be preserved when reading some undo memfile. */ static void blo_cache_storage_entry_register( - ID *id, const IDCacheKey *key, void **cache_p, uint UNUSED(flags), void *cache_storage_v) + ID *id, const IDCacheKey *key, void **cache_p, uint /*flags*/, void *cache_storage_v) { BLI_assert(key->id_session_uuid == id->session_uuid); UNUSED_VARS_NDEBUG(id); @@ -1731,7 +1731,7 @@ static void blo_cache_storage_entry_register( /** Restore a cache data entry from old ID into new one, when reading some undo memfile. */ static void blo_cache_storage_entry_restore_in_new( - ID *UNUSED(id), const IDCacheKey *key, void **cache_p, uint flags, void *cache_storage_v) + ID * /*id*/, const IDCacheKey *key, void **cache_p, uint flags, void *cache_storage_v) { BLOCacheStorage *cache_storage = static_cast(cache_storage_v); @@ -1756,11 +1756,8 @@ static void blo_cache_storage_entry_restore_in_new( } /** Clear as needed a cache data entry from old ID, when reading some undo memfile. */ -static void blo_cache_storage_entry_clear_in_old(ID *UNUSED(id), - const IDCacheKey *key, - void **cache_p, - uint UNUSED(flags), - void *cache_storage_v) +static void blo_cache_storage_entry_clear_in_old( + ID * /*id*/, const IDCacheKey *key, void **cache_p, uint /*flags*/, void *cache_storage_v) { BLOCacheStorage *cache_storage = static_cast(cache_storage_v); @@ -2887,7 +2884,7 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main) id_us_ensure_real(&lib->id); } -static void lib_link_library(BlendLibReader *UNUSED(reader), Library *UNUSED(lib)) +static void lib_link_library(BlendLibReader * /*reader*/, Library * /*lib*/) { } @@ -3230,7 +3227,7 @@ static bool read_libblock_undo_restore_linked(FileData *fd, Main *main, const ID /* For undo, restore unchanged datablock from old main. */ static void read_libblock_undo_restore_identical( - FileData *fd, Main *main, const ID *UNUSED(id), ID *id_old, const int tag) + FileData *fd, Main *main, const ID * /*id*/, ID *id_old, const int tag) { BLI_assert((fd->skip_flags & BLO_READ_SKIP_UNDO_OLD_MAIN) == 0); BLI_assert(id_old != nullptr); @@ -3597,7 +3594,7 @@ static void link_global(FileData *fd, BlendFileData *bfd) /** \name Versioning * \{ */ -static void do_versions_userdef(FileData *UNUSED(fd), BlendFileData *bfd) +static void do_versions_userdef(FileData * /*fd*/, BlendFileData *bfd) { UserDef *user = bfd->user; @@ -5121,7 +5118,7 @@ static void convert_pointer_array_64_to_32(BlendDataReader *reader, } } -static void convert_pointer_array_32_to_64(BlendDataReader *UNUSED(reader), +static void convert_pointer_array_32_to_64(BlendDataReader * /*reader*/, uint array_size, const uint32_t *src, uint64_t *dst) diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc index 95bdb9b0a1c..256eed76ffd 100644 --- a/source/blender/blenloader/intern/versioning_300.cc +++ b/source/blender/blenloader/intern/versioning_300.cc @@ -465,13 +465,13 @@ static void do_versions_sequencer_speed_effect_recursive(Scene *scene, const Lis #undef SEQ_SPEED_COMPRESS_IPO_Y } -static bool do_versions_sequencer_color_tags(Sequence *seq, void *UNUSED(user_data)) +static bool do_versions_sequencer_color_tags(Sequence *seq, void * /*user_data*/) { seq->color_tag = SEQUENCE_COLOR_NONE; return true; } -static bool do_versions_sequencer_color_balance_sop(Sequence *seq, void *UNUSED(user_data)) +static bool do_versions_sequencer_color_balance_sop(Sequence *seq, void * /*user_data*/) { LISTBASE_FOREACH (SequenceModifierData *, smd, &seq->modifiers) { if (smd->type == seqModifierType_ColorBalance) { @@ -670,7 +670,7 @@ static bool seq_speed_factor_set(Sequence *seq, void *user_data) return true; } -void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports)) +void do_versions_after_linking_300(Main *bmain, ReportList * /*reports*/) { if (MAIN_VERSION_ATLEAST(bmain, 300, 0) && !MAIN_VERSION_ATLEAST(bmain, 300, 1)) { /* Set zero user text objects to have a fake user. */ @@ -1028,9 +1028,9 @@ static void do_version_bbone_len_scale_fcurve_fix(FCurve *fcu) replace_bbone_len_scale_rnapath(&fcu->rna_path, &fcu->array_index); } -static void do_version_bbone_len_scale_animdata_cb(ID *UNUSED(id), +static void do_version_bbone_len_scale_animdata_cb(ID * /*id*/, AnimData *adt, - void *UNUSED(wrapper_data)) + void * /*wrapper_data*/) { LISTBASE_FOREACH_MUTABLE (FCurve *, fcu, &adt->drivers) { do_version_bbone_len_scale_fcurve_fix(fcu); @@ -1078,7 +1078,7 @@ static bNodeSocket *do_version_replace_float_size_with_vector(bNodeTree *ntree, return new_socket; } -static bool seq_transform_origin_set(Sequence *seq, void *UNUSED(user_data)) +static bool seq_transform_origin_set(Sequence *seq, void * /*user_data*/) { StripTransform *transform = seq->strip->transform; if (seq->strip->transform != nullptr) { @@ -1087,7 +1087,7 @@ static bool seq_transform_origin_set(Sequence *seq, void *UNUSED(user_data)) return true; } -static bool seq_transform_filter_set(Sequence *seq, void *UNUSED(user_data)) +static bool seq_transform_filter_set(Sequence *seq, void * /*user_data*/) { StripTransform *transform = seq->strip->transform; if (seq->strip->transform != nullptr) { @@ -1096,7 +1096,7 @@ static bool seq_transform_filter_set(Sequence *seq, void *UNUSED(user_data)) return true; } -static bool seq_meta_channels_ensure(Sequence *seq, void *UNUSED(user_data)) +static bool seq_meta_channels_ensure(Sequence *seq, void * /*user_data*/) { if (seq->type == SEQ_TYPE_META) { SEQ_channels_ensure(&seq->channels); @@ -1341,7 +1341,7 @@ static bool version_fix_seq_meta_range(Sequence *seq, void *user_data) return true; } -static bool version_merge_still_offsets(Sequence *seq, void *UNUSED(user_data)) +static bool version_merge_still_offsets(Sequence *seq, void * /*user_data*/) { seq->startofs -= seq->startstill; seq->endofs -= seq->endstill; @@ -1933,7 +1933,7 @@ static void version_geometry_nodes_replace_transfer_attribute_node(bNodeTree *nt } /* NOLINTNEXTLINE: readability-function-size */ -void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) +void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain) { /* The #SCE_SNAP_SEQ flag has been removed in favor of the #SCE_SNAP which can be used for each * snap_flag member individually. */ diff --git a/source/blender/blenloader/intern/writefile.cc b/source/blender/blenloader/intern/writefile.cc index f789aa157e9..4625a4471fe 100644 --- a/source/blender/blenloader/intern/writefile.cc +++ b/source/blender/blenloader/intern/writefile.cc @@ -643,7 +643,7 @@ static void mywrite_id_begin(WriteData *wd, ID *id) * * Only does something when storing an undo step. */ -static void mywrite_id_end(WriteData *wd, ID *UNUSED(id)) +static void mywrite_id_end(WriteData *wd, ID * /*id*/) { if (wd->use_memfile) { /* Very important to do it after every ID write now, otherwise we cannot know whether a diff --git a/source/blender/bmesh/intern/bmesh_mesh.cc b/source/blender/bmesh/intern/bmesh_mesh.cc index 4f42ce4a470..5c8f32b9bfa 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.cc +++ b/source/blender/bmesh/intern/bmesh_mesh.cc @@ -269,7 +269,7 @@ void BM_mesh_free(BMesh *bm) MEM_freeN(bm); } -void bmesh_edit_begin(BMesh *UNUSED(bm), BMOpTypeFlag UNUSED(type_flag)) +void bmesh_edit_begin(BMesh * /*bm*/, BMOpTypeFlag /*type_flag*/) { /* Most operators seem to be using BMO_OPTYPE_FLAG_UNTAN_MULTIRES to change the MDisps to * absolute space during mesh edits. With this enabled, changes to the topology diff --git a/source/blender/bmesh/tools/bmesh_boolean.cc b/source/blender/bmesh/tools/bmesh_boolean.cc index 50a6812895f..288a0d9ab74 100644 --- a/source/blender/bmesh/tools/bmesh_boolean.cc +++ b/source/blender/bmesh/tools/bmesh_boolean.cc @@ -466,16 +466,16 @@ bool BM_mesh_boolean_knife(BMesh *bm, blender::meshintersect::BoolOpType::None); } #else -bool BM_mesh_boolean(BMesh *UNUSED(bm), +bool BM_mesh_boolean(BMesh * /*bm*/, struct BMLoop *(*looptris)[3], - const int UNUSED(looptris_tot), + const int /*looptris_tot*/, int (*test_fn)(BMFace *, void *), - void *UNUSED(user_data), - const int UNUSED(nshapes), - const bool UNUSED(use_self), - const bool UNUSED(keep_hidden), - const bool UNUSED(hole_tolerant), - const int UNUSED(boolean_mode)) + void * /*user_data*/, + const int /*nshapes*/, + const bool /*use_self*/, + const bool /*keep_hidden*/, + const bool /*hole_tolerant*/, + const int /*boolean_mode*/) { UNUSED_VARS(looptris, test_fn); return false; @@ -489,16 +489,16 @@ bool BM_mesh_boolean(BMesh *UNUSED(bm), * TODO: need to ensure that "selected/non-selected" flag of original faces gets propagated * to the intersection result faces. */ -bool BM_mesh_boolean_knife(BMesh *UNUSED(bm), +bool BM_mesh_boolean_knife(BMesh * /*bm*/, struct BMLoop *(*looptris)[3], - const int UNUSED(looptris_tot), + const int /*looptris_tot*/, int (*test_fn)(BMFace *, void *), - void *UNUSED(user_data), - const int UNUSED(nshapes), - const bool UNUSED(use_self), - const bool UNUSED(use_separate_all), - const bool UNUSED(hole_tolerant), - const bool UNUSED(keep_hidden)) + void * /*user_data*/, + const int /*nshapes*/, + const bool /*use_self*/, + const bool /*use_separate_all*/, + const bool /*hole_tolerant*/, + const bool /*keep_hidden*/) { UNUSED_VARS(looptris, test_fn); return false; diff --git a/source/blender/compositor/intern/COM_MetaData.cc b/source/blender/compositor/intern/COM_MetaData.cc index 9ee3d7e5c22..94a0bc8706b 100644 --- a/source/blender/compositor/intern/COM_MetaData.cc +++ b/source/blender/compositor/intern/COM_MetaData.cc @@ -72,7 +72,7 @@ void MetaDataExtractCallbackData::set_cryptomatte_keys(blender::StringRef crypto void MetaDataExtractCallbackData::extract_cryptomatte_meta_data(void *_data, const char *propname, char *propvalue, - int UNUSED(len)) + int /*len*/) { MetaDataExtractCallbackData *data = static_cast(_data); blender::StringRefNull key(propname); diff --git a/source/blender/compositor/intern/COM_MultiThreadedOperation.h b/source/blender/compositor/intern/COM_MultiThreadedOperation.h index 9ec81fa834e..355081c374d 100644 --- a/source/blender/compositor/intern/COM_MultiThreadedOperation.h +++ b/source/blender/compositor/intern/COM_MultiThreadedOperation.h @@ -24,9 +24,9 @@ class MultiThreadedOperation : public NodeOperation { /** * Called before an update memory buffer pass is executed. Single-threaded calls. */ - virtual void update_memory_buffer_started(MemoryBuffer *UNUSED(output), - const rcti &UNUSED(area), - Span UNUSED(inputs)) + virtual void update_memory_buffer_started(MemoryBuffer * /*output*/, + const rcti & /*area*/, + Span /*inputs*/) { } @@ -40,9 +40,9 @@ class MultiThreadedOperation : public NodeOperation { /** * Called after an update memory buffer pass is executed. Single-threaded calls. */ - virtual void update_memory_buffer_finished(MemoryBuffer *UNUSED(output), - const rcti &UNUSED(area), - Span UNUSED(inputs)) + virtual void update_memory_buffer_finished(MemoryBuffer * /*output*/, + const rcti & /*area*/, + Span /*inputs*/) { } diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index aa9e4329ab6..a00ac1352fe 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -628,9 +628,9 @@ class NodeOperation { /** * Executes operation updating output memory buffer. Single-threaded calls. */ - virtual void update_memory_buffer(MemoryBuffer *UNUSED(output), - const rcti &UNUSED(area), - Span UNUSED(inputs)) + virtual void update_memory_buffer(MemoryBuffer * /*output*/, + const rcti & /*area*/, + Span /*inputs*/) { } diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cc b/source/blender/compositor/intern/COM_WorkScheduler.cc index 9414d7d7afa..9067807d98c 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cc +++ b/source/blender/compositor/intern/COM_WorkScheduler.cc @@ -377,7 +377,7 @@ static void threading_model_queue_deinitialize() /** \name Task Scheduling * \{ */ -static void threading_model_task_execute(TaskPool *__restrict UNUSED(pool), void *task_data) +static void threading_model_task_execute(TaskPool *__restrict /*pool*/, void *task_data) { WorkPackage *package = static_cast(task_data); CPUDevice device(BLI_task_parallel_thread_id(nullptr)); diff --git a/source/blender/compositor/nodes/COM_CombineColorNode.cc b/source/blender/compositor/nodes/COM_CombineColorNode.cc index 36ff24cb9c3..7802a585c05 100644 --- a/source/blender/compositor/nodes/COM_CombineColorNode.cc +++ b/source/blender/compositor/nodes/COM_CombineColorNode.cc @@ -12,7 +12,7 @@ CombineColorNode::CombineColorNode(bNode *editor_node) : Node(editor_node) } void CombineColorNode::convert_to_operations(NodeConverter &converter, - const CompositorContext &UNUSED(context)) const + const CompositorContext & /*context*/) const { NodeInput *input_rsocket = this->get_input_socket(0); NodeInput *input_gsocket = this->get_input_socket(1); diff --git a/source/blender/compositor/nodes/COM_CombineXYZNode.cc b/source/blender/compositor/nodes/COM_CombineXYZNode.cc index 0b46f7ba0d4..dd09dabef02 100644 --- a/source/blender/compositor/nodes/COM_CombineXYZNode.cc +++ b/source/blender/compositor/nodes/COM_CombineXYZNode.cc @@ -12,7 +12,7 @@ CombineXYZNode::CombineXYZNode(bNode *editor_node) : Node(editor_node) } void CombineXYZNode::convert_to_operations(NodeConverter &converter, - const CompositorContext &UNUSED(context)) const + const CompositorContext & /*context*/) const { NodeInput *input_x_socket = this->get_input_socket(0); NodeInput *input_y_socket = this->get_input_socket(1); diff --git a/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc b/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc index 7d557de66e4..d26b649e30b 100644 --- a/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc +++ b/source/blender/compositor/nodes/COM_ConvertColorSpaceNode.cc @@ -25,7 +25,7 @@ ConvertColorSpaceNode::ConvertColorSpaceNode(bNode *editorNode) : Node(editorNod } void ConvertColorSpaceNode::convert_to_operations(NodeConverter &converter, - const CompositorContext &UNUSED(context)) const + const CompositorContext & /*context*/) const { const bNode *b_node = get_bnode(); diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc index 42d699af01b..751ac0003bf 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cc @@ -240,8 +240,8 @@ CryptomatteOperation *CryptomatteNode::create_cryptomatte_operation( CryptomatteOperation *CryptomatteLegacyNode::create_cryptomatte_operation( NodeConverter &converter, - const CompositorContext &UNUSED(context), - const bNode &UNUSED(node), + const CompositorContext & /*context*/, + const bNode & /*node*/, const NodeCryptomatte *cryptomatte_settings) const { const int num_inputs = inputs_.size() - 1; diff --git a/source/blender/compositor/nodes/COM_SeparateColorNode.cc b/source/blender/compositor/nodes/COM_SeparateColorNode.cc index 28ebbb35e9a..6732396004f 100644 --- a/source/blender/compositor/nodes/COM_SeparateColorNode.cc +++ b/source/blender/compositor/nodes/COM_SeparateColorNode.cc @@ -12,7 +12,7 @@ SeparateColorNode::SeparateColorNode(bNode *editor_node) : Node(editor_node) } void SeparateColorNode::convert_to_operations(NodeConverter &converter, - const CompositorContext &UNUSED(context)) const + const CompositorContext & /*context*/) const { NodeInput *image_socket = this->get_input_socket(0); NodeOutput *output_rsocket = this->get_output_socket(0); diff --git a/source/blender/compositor/nodes/COM_SeparateXYZNode.cc b/source/blender/compositor/nodes/COM_SeparateXYZNode.cc index 4e7704dcdc8..7aa8de04c34 100644 --- a/source/blender/compositor/nodes/COM_SeparateXYZNode.cc +++ b/source/blender/compositor/nodes/COM_SeparateXYZNode.cc @@ -13,7 +13,7 @@ SeparateXYZNode::SeparateXYZNode(bNode *editor_node) : Node(editor_node) } void SeparateXYZNode::convert_to_operations(NodeConverter &converter, - const CompositorContext &UNUSED(context)) const + const CompositorContext & /*context*/) const { NodeInput *vector_socket = this->get_input_socket(0); NodeOutput *output_x_socket = this->get_output_socket(0); diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.cc b/source/blender/compositor/operations/COM_BilateralBlurOperation.cc index 3711851e8f5..c808ec02690 100644 --- a/source/blender/compositor/operations/COM_BilateralBlurOperation.cc +++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.cc @@ -95,7 +95,7 @@ bool BilateralBlurOperation::determine_depending_area_of_interest( return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output); } -void BilateralBlurOperation::get_area_of_interest(const int UNUSED(input_idx), +void BilateralBlurOperation::get_area_of_interest(const int /*input_idx*/, const rcti &output_area, rcti &r_input_area) { diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.cc b/source/blender/compositor/operations/COM_BokehImageOperation.cc index 9828d38d83f..b74ac9dac64 100644 --- a/source/blender/compositor/operations/COM_BokehImageOperation.cc +++ b/source/blender/compositor/operations/COM_BokehImageOperation.cc @@ -96,7 +96,7 @@ void BokehImageOperation::execute_pixel_sampled(float output[4], void BokehImageOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { const float shift = data_->lensshift; const float shift2 = shift / 2.0f; diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc index 4e5832a7d34..9dbeabafa5a 100644 --- a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc +++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc @@ -144,15 +144,15 @@ void CalculateMeanOperation::set_setting(int setting) } void CalculateMeanOperation::get_area_of_interest(int input_idx, - const rcti &UNUSED(output_area), + const rcti & /*output_area*/, rcti &r_input_area) { BLI_assert(input_idx == 0); r_input_area = get_input_operation(input_idx)->get_canvas(); } -void CalculateMeanOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output), - const rcti &UNUSED(area), +void CalculateMeanOperation::update_memory_buffer_started(MemoryBuffer * /*output*/, + const rcti & /*area*/, Span inputs) { if (!iscalculated_) { @@ -164,7 +164,7 @@ void CalculateMeanOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(o void CalculateMeanOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { output->fill(area, &result_); } diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc index 95acf51413c..709218297b7 100644 --- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc +++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc @@ -81,8 +81,9 @@ void *CalculateStandardDeviationOperation::initialize_tile_data(rcti *rect) return nullptr; } -void CalculateStandardDeviationOperation::update_memory_buffer_started( - MemoryBuffer *UNUSED(output), const rcti &UNUSED(area), Span inputs) +void CalculateStandardDeviationOperation::update_memory_buffer_started(MemoryBuffer * /*output*/, + const rcti & /*area*/, + Span inputs) { if (!iscalculated_) { const MemoryBuffer *input = inputs[0]; @@ -104,7 +105,7 @@ void CalculateStandardDeviationOperation::update_memory_buffer_started( } void CalculateStandardDeviationOperation::update_memory_buffer_partial( - MemoryBuffer *output, const rcti &area, Span UNUSED(inputs)) + MemoryBuffer *output, const rcti &area, Span /*inputs*/) { output->fill(area, &standard_deviation_); } diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cc b/source/blender/compositor/operations/COM_CompositorOperation.cc index 039a2538427..1ff27607d09 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cc +++ b/source/blender/compositor/operations/COM_CompositorOperation.cc @@ -197,7 +197,7 @@ void CompositorOperation::execute_region(rcti *rect, uint /*tile_number*/) } } -void CompositorOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(output), +void CompositorOperation::update_memory_buffer_partial(MemoryBuffer * /*output*/, const rcti &area, Span inputs) { @@ -213,7 +213,7 @@ void CompositorOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(outp depth_buf.copy_from(inputs[2], area); } -void CompositorOperation::determine_canvas(const rcti &UNUSED(preferred_area), rcti &r_area) +void CompositorOperation::determine_canvas(const rcti & /*preferred_area*/, rcti &r_area) { int width, height; BKE_render_resolution(rd_, false, &width, &height); diff --git a/source/blender/compositor/operations/COM_ConstantOperation.cc b/source/blender/compositor/operations/COM_ConstantOperation.cc index 0977da5e37c..21c10f2b52a 100644 --- a/source/blender/compositor/operations/COM_ConstantOperation.cc +++ b/source/blender/compositor/operations/COM_ConstantOperation.cc @@ -19,7 +19,7 @@ bool ConstantOperation::can_get_constant_elem() const void ConstantOperation::update_memory_buffer(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { BLI_assert(output->is_a_single_elem()); const float *constant = get_constant_elem(); diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.cc b/source/blender/compositor/operations/COM_DenoiseOperation.cc index 123f33d3c9e..5019c2bb158 100644 --- a/source/blender/compositor/operations/COM_DenoiseOperation.cc +++ b/source/blender/compositor/operations/COM_DenoiseOperation.cc @@ -89,7 +89,7 @@ class DenoiseFilter { } #else - void init_and_lock_denoiser(MemoryBuffer *UNUSED(output)) + void init_and_lock_denoiser(MemoryBuffer * /*output*/) { } @@ -97,11 +97,11 @@ class DenoiseFilter { { } - void set_image(const StringRef UNUSED(name), MemoryBuffer *UNUSED(buffer)) + void set_image(const StringRef /*name*/, MemoryBuffer * /*buffer*/) { } - template void set(const StringRef UNUSED(option_name), T UNUSED(value)) + template void set(const StringRef /*option_name*/, T /*value*/) { } @@ -132,8 +132,8 @@ bool DenoiseBaseOperation::determine_depending_area_of_interest( return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output); } -void DenoiseBaseOperation::get_area_of_interest(const int UNUSED(input_idx), - const rcti &UNUSED(output_area), +void DenoiseBaseOperation::get_area_of_interest(const int /*input_idx*/, + const rcti & /*output_area*/, rcti &r_input_area) { r_input_area = this->get_canvas(); @@ -251,7 +251,7 @@ void DenoiseOperation::generate_denoise(MemoryBuffer *output, } void DenoiseOperation::update_memory_buffer(MemoryBuffer *output, - const rcti &UNUSED(area), + const rcti & /*area*/, Span inputs) { if (!output_rendered_) { @@ -304,7 +304,7 @@ void DenoisePrefilterOperation::generate_denoise(MemoryBuffer *output, MemoryBuf } void DenoisePrefilterOperation::update_memory_buffer(MemoryBuffer *output, - const rcti &UNUSED(area), + const rcti & /*area*/, Span inputs) { if (!output_rendered_) { diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc index 31ff3b5f4a2..5e292fa12c2 100644 --- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc +++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc @@ -128,7 +128,7 @@ bool DirectionalBlurOperation::determine_depending_area_of_interest( } void DirectionalBlurOperation::get_area_of_interest(const int input_idx, - const rcti &UNUSED(output_area), + const rcti & /*output_area*/, rcti &r_input_area) { BLI_assert(input_idx == 0); diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.cc b/source/blender/compositor/operations/COM_DisplaceOperation.cc index bbc8c09e866..1aec8e12242 100644 --- a/source/blender/compositor/operations/COM_DisplaceOperation.cc +++ b/source/blender/compositor/operations/COM_DisplaceOperation.cc @@ -209,8 +209,8 @@ void DisplaceOperation::get_area_of_interest(const int input_idx, } } -void DisplaceOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output), - const rcti &UNUSED(area), +void DisplaceOperation::update_memory_buffer_started(MemoryBuffer * /*output*/, + const rcti & /*area*/, Span inputs) { MemoryBuffer *vector = inputs[1]; diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc index 28c0b44ac2f..e120dd5f41a 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc @@ -1354,15 +1354,15 @@ void DoubleEdgeMaskOperation::deinit_execution() } } -void DoubleEdgeMaskOperation::get_area_of_interest(int UNUSED(input_idx), - const rcti &UNUSED(output_area), +void DoubleEdgeMaskOperation::get_area_of_interest(int /*input_idx*/, + const rcti & /*output_area*/, rcti &r_input_area) { r_input_area = this->get_canvas(); } void DoubleEdgeMaskOperation::update_memory_buffer(MemoryBuffer *output, - const rcti &UNUSED(area), + const rcti & /*area*/, Span inputs) { if (!is_output_rendered_) { diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc index 988b1c0d533..7557d1bc4bd 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc @@ -384,15 +384,15 @@ void *FastGaussianBlurValueOperation::initialize_tile_data(rcti *rect) return iirgaus_; } -void FastGaussianBlurValueOperation::get_area_of_interest(const int UNUSED(input_idx), - const rcti &UNUSED(output_area), +void FastGaussianBlurValueOperation::get_area_of_interest(const int /*input_idx*/, + const rcti & /*output_area*/, rcti &r_input_area) { r_input_area = this->get_canvas(); } -void FastGaussianBlurValueOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output), - const rcti &UNUSED(area), +void FastGaussianBlurValueOperation::update_memory_buffer_started(MemoryBuffer * /*output*/, + const rcti & /*area*/, Span inputs) { if (iirgaus_ == nullptr) { diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h index 157d3c7f32f..0f7064c19a5 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h @@ -31,9 +31,9 @@ class FastGaussianBlurOperation : public BlurBaseOperation { void update_memory_buffer_started(MemoryBuffer *output, const rcti &area, Span inputs) override; - void update_memory_buffer_partial(MemoryBuffer *UNUSED(output), - const rcti &UNUSED(area), - Span UNUSED(inputs)) override + void update_memory_buffer_partial(MemoryBuffer * /*output*/, + const rcti & /*area*/, + Span /*inputs*/) override { } }; diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.cc b/source/blender/compositor/operations/COM_GlareBaseOperation.cc index 13f55b5909c..93d3c2063ae 100644 --- a/source/blender/compositor/operations/COM_GlareBaseOperation.cc +++ b/source/blender/compositor/operations/COM_GlareBaseOperation.cc @@ -56,7 +56,7 @@ bool GlareBaseOperation::determine_depending_area_of_interest(rcti * /*input*/, } void GlareBaseOperation::get_area_of_interest(const int input_idx, - const rcti &UNUSED(output_area), + const rcti & /*output_area*/, rcti &r_input_area) { BLI_assert(input_idx == 0); @@ -68,7 +68,7 @@ void GlareBaseOperation::get_area_of_interest(const int input_idx, } void GlareBaseOperation::update_memory_buffer(MemoryBuffer *output, - const rcti &UNUSED(area), + const rcti & /*area*/, Span inputs) { if (!is_output_rendered_) { diff --git a/source/blender/compositor/operations/COM_ImageOperation.cc b/source/blender/compositor/operations/COM_ImageOperation.cc index 0d0b699eefc..e1ac5e42be3 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.cc +++ b/source/blender/compositor/operations/COM_ImageOperation.cc @@ -90,7 +90,7 @@ void BaseImageOperation::deinit_execution() } } -void BaseImageOperation::determine_canvas(const rcti &UNUSED(preferred_area), rcti &r_area) +void BaseImageOperation::determine_canvas(const rcti & /*preferred_area*/, rcti &r_area) { ImBuf *stackbuf = get_im_buf(); @@ -155,7 +155,7 @@ void ImageOperation::execute_pixel_sampled(float output[4], float x, float y, Pi void ImageOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { output->copy_from(buffer_, area, true); } @@ -179,7 +179,7 @@ void ImageAlphaOperation::execute_pixel_sampled(float output[4], void ImageAlphaOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { output->copy_from(buffer_, area, 3, COM_DATA_TYPE_VALUE_CHANNELS, 0); } @@ -205,7 +205,7 @@ void ImageDepthOperation::execute_pixel_sampled(float output[4], void ImageDepthOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { if (depth_buffer_) { output->copy_from(depth_buffer_, area); diff --git a/source/blender/compositor/operations/COM_InpaintOperation.cc b/source/blender/compositor/operations/COM_InpaintOperation.cc index 12533c26a53..a2e02e9f045 100644 --- a/source/blender/compositor/operations/COM_InpaintOperation.cc +++ b/source/blender/compositor/operations/COM_InpaintOperation.cc @@ -267,7 +267,7 @@ bool InpaintSimpleOperation::determine_depending_area_of_interest( } void InpaintSimpleOperation::get_area_of_interest(const int input_idx, - const rcti &UNUSED(output_area), + const rcti & /*output_area*/, rcti &r_input_area) { BLI_assert(input_idx == 0); diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.cc b/source/blender/compositor/operations/COM_KeyingBlurOperation.cc index 4ae11c04506..a63789f06c3 100644 --- a/source/blender/compositor/operations/COM_KeyingBlurOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.cc @@ -75,7 +75,7 @@ bool KeyingBlurOperation::determine_depending_area_of_interest(rcti *input, return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output); } -void KeyingBlurOperation::get_area_of_interest(const int UNUSED(input_idx), +void KeyingBlurOperation::get_area_of_interest(const int /*input_idx*/, const rcti &output_area, rcti &r_input_area) { diff --git a/source/blender/compositor/operations/COM_MapUVOperation.cc b/source/blender/compositor/operations/COM_MapUVOperation.cc index e6899949528..c300508268e 100644 --- a/source/blender/compositor/operations/COM_MapUVOperation.cc +++ b/source/blender/compositor/operations/COM_MapUVOperation.cc @@ -201,8 +201,8 @@ void MapUVOperation::get_area_of_interest(const int input_idx, } } -void MapUVOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output), - const rcti &UNUSED(area), +void MapUVOperation::update_memory_buffer_started(MemoryBuffer * /*output*/, + const rcti & /*area*/, Span inputs) { const MemoryBuffer *uv_input = inputs[UV_INPUT_INDEX]; diff --git a/source/blender/compositor/operations/COM_MaskOperation.cc b/source/blender/compositor/operations/COM_MaskOperation.cc index d8b7c52d9d7..53f59f831db 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.cc +++ b/source/blender/compositor/operations/COM_MaskOperation.cc @@ -131,7 +131,7 @@ void MaskOperation::execute_pixel_sampled(float output[4], void MaskOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { Vector handles = get_non_null_handles(); if (handles.size() == 0) { diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.cc b/source/blender/compositor/operations/COM_MovieClipOperation.cc index b62d972e807..bbc762bf667 100644 --- a/source/blender/compositor/operations/COM_MovieClipOperation.cc +++ b/source/blender/compositor/operations/COM_MovieClipOperation.cc @@ -53,7 +53,7 @@ void MovieClipBaseOperation::deinit_execution() } } -void MovieClipBaseOperation::determine_canvas(const rcti &UNUSED(preferred_area), rcti &r_area) +void MovieClipBaseOperation::determine_canvas(const rcti & /*preferred_area*/, rcti &r_area) { r_area = COM_AREA_NONE; if (movie_clip_) { @@ -94,7 +94,7 @@ void MovieClipBaseOperation::execute_pixel_sampled(float output[4], void MovieClipBaseOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { if (movie_clip_buffer_) { output->copy_from(movie_clip_buffer_, area); @@ -126,7 +126,7 @@ void MovieClipAlphaOperation::execute_pixel_sampled(float output[4], void MovieClipAlphaOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { if (movie_clip_buffer_) { output->copy_from(movie_clip_buffer_, area, 3, COM_DATA_TYPE_VALUE_CHANNELS, 0); diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.cc b/source/blender/compositor/operations/COM_MultilayerImageOperation.cc index 991a909ddb7..9a825939deb 100644 --- a/source/blender/compositor/operations/COM_MultilayerImageOperation.cc +++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.cc @@ -37,7 +37,7 @@ ImBuf *MultilayerBaseOperation::get_im_buf() void MultilayerBaseOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { output->copy_from(buffer_, area); } diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.cc b/source/blender/compositor/operations/COM_NormalizeOperation.cc index 1131fc28439..b408964c35f 100644 --- a/source/blender/compositor/operations/COM_NormalizeOperation.cc +++ b/source/blender/compositor/operations/COM_NormalizeOperation.cc @@ -114,15 +114,15 @@ void NormalizeOperation::deinitialize_tile_data(rcti * /*rect*/, void * /*data*/ /* pass */ } -void NormalizeOperation::get_area_of_interest(const int UNUSED(input_idx), - const rcti &UNUSED(output_area), +void NormalizeOperation::get_area_of_interest(const int /*input_idx*/, + const rcti & /*output_area*/, rcti &r_input_area) { r_input_area = get_input_operation(0)->get_canvas(); } -void NormalizeOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output), - const rcti &UNUSED(area), +void NormalizeOperation::update_memory_buffer_started(MemoryBuffer * /*output*/, + const rcti & /*area*/, Span inputs) { if (cached_instance_ == nullptr) { diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cc b/source/blender/compositor/operations/COM_OutputFileOperation.cc index 6c7333c007a..711ea787c41 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cc +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cc @@ -287,7 +287,7 @@ void OutputSingleLayerOperation::deinit_execution() image_input_ = nullptr; } -void OutputSingleLayerOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(output), +void OutputSingleLayerOperation::update_memory_buffer_partial(MemoryBuffer * /*output*/, const rcti &area, Span inputs) { @@ -449,7 +449,7 @@ void OutputOpenExrMultiLayerOperation::deinit_execution() } } -void OutputOpenExrMultiLayerOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(output), +void OutputOpenExrMultiLayerOperation::update_memory_buffer_partial(MemoryBuffer * /*output*/, const rcti &area, Span inputs) { diff --git a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc index 006f1f919ba..fcd37f2a179 100644 --- a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc +++ b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc @@ -195,8 +195,8 @@ void PlaneCornerPinMaskOperation::determine_canvas(const rcti &preferred_area, r r_area = preferred_area; } -void PlaneCornerPinMaskOperation::get_area_of_interest(const int UNUSED(input_idx), - const rcti &UNUSED(output_area), +void PlaneCornerPinMaskOperation::get_area_of_interest(const int /*input_idx*/, + const rcti & /*output_area*/, rcti &r_input_area) { /* All corner inputs are used as constants. */ diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc index 18b43f73356..59e924311e3 100644 --- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc +++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc @@ -284,7 +284,7 @@ void PlaneDistortMaskOperation::execute_pixel_sampled(float output[4], void PlaneDistortMaskOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { for (BuffersIterator it = output->iterate_with({}, area); !it.is_end(); ++it) { int inside_count = 0; diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cc b/source/blender/compositor/operations/COM_PreviewOperation.cc index cf48942c542..2b9fc7ddc8c 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cc +++ b/source/blender/compositor/operations/COM_PreviewOperation.cc @@ -101,7 +101,7 @@ bool PreviewOperation::determine_depending_area_of_interest(rcti *input, return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output); } -void PreviewOperation::determine_canvas(const rcti &UNUSED(preferred_area), rcti &r_area) +void PreviewOperation::determine_canvas(const rcti & /*preferred_area*/, rcti &r_area) { /* Use default preview resolution as preferred ensuring it has size so that * generated inputs (which don't have resolution on their own) are displayed */ @@ -154,7 +154,7 @@ void PreviewOperation::get_area_of_interest(const int input_idx, r_input_area.ymax = output_area.ymax / divider_; } -void PreviewOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(output), +void PreviewOperation::update_memory_buffer_partial(MemoryBuffer * /*output*/, const rcti &area, Span inputs) { diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cc b/source/blender/compositor/operations/COM_RenderLayersProg.cc index e390ab38c7f..d95ee2a5e1a 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cc +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cc @@ -169,7 +169,7 @@ void RenderLayersProg::deinit_execution() } } -void RenderLayersProg::determine_canvas(const rcti &UNUSED(preferred_area), rcti &r_area) +void RenderLayersProg::determine_canvas(const rcti & /*preferred_area*/, rcti &r_area) { Scene *sce = this->get_scene(); Render *re = (sce) ? RE_GetSceneRender(sce) : nullptr; @@ -235,7 +235,7 @@ std::unique_ptr RenderLayersProg::get_meta_data() void RenderLayersProg::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { BLI_assert(output->get_num_channels() >= elementsize_); if (layer_buffer_) { @@ -266,7 +266,7 @@ void RenderLayersAOOperation::execute_pixel_sampled(float output[4], void RenderLayersAOOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { BLI_assert(output->get_num_channels() == COM_DATA_TYPE_COLOR_CHANNELS); BLI_assert(elementsize_ == COM_DATA_TYPE_COLOR_CHANNELS); @@ -300,7 +300,7 @@ void RenderLayersAlphaProg::execute_pixel_sampled(float output[4], void RenderLayersAlphaProg::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { BLI_assert(output->get_num_channels() == COM_DATA_TYPE_VALUE_CHANNELS); BLI_assert(elementsize_ == COM_DATA_TYPE_COLOR_CHANNELS); @@ -335,7 +335,7 @@ void RenderLayersDepthProg::execute_pixel_sampled(float output[4], void RenderLayersDepthProg::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, - Span UNUSED(inputs)) + Span /*inputs*/) { BLI_assert(output->get_num_channels() == COM_DATA_TYPE_VALUE_CHANNELS); BLI_assert(elementsize_ == COM_DATA_TYPE_VALUE_CHANNELS); diff --git a/source/blender/compositor/operations/COM_SMAAOperation.cc b/source/blender/compositor/operations/COM_SMAAOperation.cc index 7bbc600cda2..8f4ed844b9f 100644 --- a/source/blender/compositor/operations/COM_SMAAOperation.cc +++ b/source/blender/compositor/operations/COM_SMAAOperation.cc @@ -196,7 +196,7 @@ bool SMAAEdgeDetectionOperation::determine_depending_area_of_interest( return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output); } -void SMAAEdgeDetectionOperation::get_area_of_interest(const int UNUSED(input_idx), +void SMAAEdgeDetectionOperation::get_area_of_interest(const int /*input_idx*/, const rcti &output_area, rcti &r_input_area) { @@ -505,14 +505,14 @@ void SMAABlendingWeightCalculationOperation::execute_pixel(float output[4], } void SMAABlendingWeightCalculationOperation::update_memory_buffer_started( - MemoryBuffer *UNUSED(output), const rcti &UNUSED(out_area), Span inputs) + MemoryBuffer * /*output*/, const rcti & /*out_area*/, Span inputs) { const MemoryBuffer *image = inputs[0]; sample_image_fn_ = [=](int x, int y, float *out) { image->read_elem_checked(x, y, out); }; } void SMAABlendingWeightCalculationOperation::update_memory_buffer_partial( - MemoryBuffer *output, const rcti &out_area, Span UNUSED(inputs)) + MemoryBuffer *output, const rcti &out_area, Span /*inputs*/) { for (BuffersIterator it = output->iterate_with({}, out_area); !it.is_end(); ++it) { const int x = it.x; @@ -631,7 +631,7 @@ bool SMAABlendingWeightCalculationOperation::determine_depending_area_of_interes return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output); } -void SMAABlendingWeightCalculationOperation::get_area_of_interest(const int UNUSED(input_idx), +void SMAABlendingWeightCalculationOperation::get_area_of_interest(const int /*input_idx*/, const rcti &output_area, rcti &r_input_area) { @@ -1123,7 +1123,7 @@ bool SMAANeighborhoodBlendingOperation::determine_depending_area_of_interest( return NodeOperation::determine_depending_area_of_interest(&new_input, read_operation, output); } -void SMAANeighborhoodBlendingOperation::get_area_of_interest(const int UNUSED(input_idx), +void SMAANeighborhoodBlendingOperation::get_area_of_interest(const int /*input_idx*/, const rcti &output_area, rcti &r_input_area) { diff --git a/source/blender/compositor/operations/COM_ScaleOperation.h b/source/blender/compositor/operations/COM_ScaleOperation.h index 4cd50f3ead3..ba291342e96 100644 --- a/source/blender/compositor/operations/COM_ScaleOperation.h +++ b/source/blender/compositor/operations/COM_ScaleOperation.h @@ -112,12 +112,12 @@ class ScaleRelativeOperation : public ScaleOperation { rcti *output) override; void execute_pixel_sampled(float output[4], float x, float y, PixelSampler sampler) override; - float get_relative_scale_x_factor(float UNUSED(width)) override + float get_relative_scale_x_factor(float /*width*/) override { return 1.0f; } - float get_relative_scale_y_factor(float UNUSED(height)) override + float get_relative_scale_y_factor(float /*height*/) override { return 1.0f; } diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc index e27ffcb7c9b..a62977c3280 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc @@ -384,7 +384,7 @@ void ScreenLensDistortionOperation::determine_canvas(const rcti &preferred_area, } void ScreenLensDistortionOperation::get_area_of_interest(const int input_idx, - const rcti &UNUSED(output_area), + const rcti & /*output_area*/, rcti &r_input_area) { if (input_idx != 0) { diff --git a/source/blender/compositor/operations/COM_TonemapOperation.cc b/source/blender/compositor/operations/COM_TonemapOperation.cc index ae5b60c4912..6f560eafc67 100644 --- a/source/blender/compositor/operations/COM_TonemapOperation.cc +++ b/source/blender/compositor/operations/COM_TonemapOperation.cc @@ -139,7 +139,7 @@ void TonemapOperation::deinitialize_tile_data(rcti * /*rect*/, void * /*data*/) } void TonemapOperation::get_area_of_interest(const int input_idx, - const rcti &UNUSED(output_area), + const rcti & /*output_area*/, rcti &r_input_area) { BLI_assert(input_idx == 0); @@ -170,8 +170,8 @@ static Luminance calc_area_luminance(const MemoryBuffer *input, const rcti &area return lum; } -void TonemapOperation::update_memory_buffer_started(MemoryBuffer *UNUSED(output), - const rcti &UNUSED(area), +void TonemapOperation::update_memory_buffer_started(MemoryBuffer * /*output*/, + const rcti & /*area*/, Span inputs) { if (cached_instance_ == nullptr) { diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cc b/source/blender/compositor/operations/COM_VectorBlurOperation.cc index c71d88695a7..1330557c06f 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cc +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cc @@ -103,8 +103,8 @@ bool VectorBlurOperation::determine_depending_area_of_interest(rcti * /*input*/, return false; } -void VectorBlurOperation::get_area_of_interest(const int UNUSED(input_idx), - const rcti &UNUSED(output_area), +void VectorBlurOperation::get_area_of_interest(const int /*input_idx*/, + const rcti & /*output_area*/, rcti &r_input_area) { r_input_area = this->get_canvas(); diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cc b/source/blender/compositor/operations/COM_ViewerOperation.cc index 1d0aead3a94..b4ff6878784 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cc +++ b/source/blender/compositor/operations/COM_ViewerOperation.cc @@ -216,7 +216,7 @@ eCompositorPriority ViewerOperation::get_render_priority() const return eCompositorPriority::Low; } -void ViewerOperation::update_memory_buffer_partial(MemoryBuffer *UNUSED(output), +void ViewerOperation::update_memory_buffer_partial(MemoryBuffer * /*output*/, const rcti &area, Span inputs) { diff --git a/source/blender/compositor/realtime_compositor/intern/utilities.cc b/source/blender/compositor/realtime_compositor/intern/utilities.cc index 1a5823b8441..25472d6ed50 100644 --- a/source/blender/compositor/realtime_compositor/intern/utilities.cc +++ b/source/blender/compositor/realtime_compositor/intern/utilities.cc @@ -71,7 +71,7 @@ bool is_output_linked_to_node_conditioned(DOutputSocket output, FunctionRef &it, const rcti &UNUSED(area)) { + [](BuffersIterator &it, const rcti & /*area*/) { EXPECT_EQ(it.get_num_inputs(), 0); for (; !it.is_end(); ++it) { const int dummy = it.y * BUFFER_WIDTH + it.x; @@ -247,7 +247,7 @@ TEST_F(BuffersIteratorTest, OutputIteration) it.out[3] = dummy + 4.0f; } }, - [](float *out, Span UNUSED(ins), const int x, const int y) { + [](float *out, Span /*ins*/, const int x, const int y) { const int dummy = y * BUFFER_WIDTH + x; EXPECT_NEAR(out[0], dummy + 1.0f, FLT_EPSILON); EXPECT_NEAR(out[1], dummy + 2.0f, FLT_EPSILON); @@ -260,7 +260,7 @@ TEST_F(BuffersIteratorTest, OutputAndInputsIteration) { set_inputs_enabled(true); test_iteration( - [](BuffersIterator &it, const rcti &UNUSED(area)) { + [](BuffersIterator &it, const rcti & /*area*/) { EXPECT_EQ(it.get_num_inputs(), NUM_INPUTS); for (; !it.is_end(); ++it) { const float *in1 = it.in(0); @@ -271,7 +271,7 @@ TEST_F(BuffersIteratorTest, OutputAndInputsIteration) it.out[3] = in1[3] - in2[1]; } }, - [](float *out, Span ins, const int UNUSED(x), const int UNUSED(y)) { + [](float *out, Span ins, const int /*x*/, const int /*y*/) { const float *in1 = ins[0]; const float *in2 = ins[1]; EXPECT_NEAR(out[0], in1[0] + in2[0], FLT_EPSILON); diff --git a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc index 2839f0daed7..4f28210ba8f 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc @@ -45,7 +45,7 @@ bool deg_foreach_needs_visit(const OperationNode *op_node, const int flags) return true; } -void deg_foreach_dependent_operation(const Depsgraph *UNUSED(graph), +void deg_foreach_dependent_operation(const Depsgraph * /*graph*/, const IDNode *target_id_node, eDepsObjectComponentType source_component_type, int flags, diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index 5a92f483420..4636011e18b 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -435,6 +435,6 @@ void DEG_iterator_ids_next(BLI_Iterator *iter) } while (iter->skip); } -void DEG_iterator_ids_end(BLI_Iterator *UNUSED(iter)) +void DEG_iterator_ids_end(BLI_Iterator * /*iter*/) { } diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc index 872b256c497..45a13b807af 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval.cc @@ -58,7 +58,7 @@ void schedule_children(DepsgraphEvalState *state, ScheduleFunction *schedule_function, ScheduleFunctionArgs... schedule_function_args); -void schedule_node_to_pool(OperationNode *node, const int UNUSED(thread_id), TaskPool *pool) +void schedule_node_to_pool(OperationNode *node, const int /*thread_id*/, TaskPool *pool) { BLI_task_pool_push(pool, deg_task_run_func, node, false, nullptr); } diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc index c5def69a70f..e3d7593eb3c 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc @@ -19,7 +19,7 @@ GPencilBackup::GPencilBackup(const Depsgraph *depsgraph) : depsgraph(depsgraph) { } -void GPencilBackup::init_from_gpencil(bGPdata *UNUSED(gpd)) +void GPencilBackup::init_from_gpencil(bGPdata * /*gpd*/) { } diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc index 7cbee76e709..a37feb7b95d 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.cc +++ b/source/blender/depsgraph/intern/node/deg_node_id.cc @@ -57,7 +57,7 @@ uint64_t IDNode::ComponentIDKey::hash() const BLI_ghashutil_strhash_p(name)); } -void IDNode::init(const ID *id, const char *UNUSED(subdata)) +void IDNode::init(const ID *id, const char * /*subdata*/) { BLI_assert(id != nullptr); /* Store ID-pointer. */ diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc index f36a59a4ce6..2c9e5182b01 100644 --- a/source/blender/draw/engines/compositor/compositor_engine.cc +++ b/source/blender/draw/engines/compositor/compositor_engine.cc @@ -60,7 +60,7 @@ class Context : public realtime_compositor::Context { return DRW_viewport_texture_list_get()->color; } - GPUTexture *get_input_texture(int UNUSED(view_layer), eScenePassType UNUSED(pass_type)) override + GPUTexture *get_input_texture(int /*view_layer*/, eScenePassType /*pass_type*/) override { return get_output_texture(); } diff --git a/source/blender/draw/engines/eevee_next/eevee_engine.cc b/source/blender/draw/engines/eevee_next/eevee_engine.cc index 5ef198838c9..214f6a001f0 100644 --- a/source/blender/draw/engines/eevee_next/eevee_engine.cc +++ b/source/blender/draw/engines/eevee_next/eevee_engine.cc @@ -143,7 +143,7 @@ static void eevee_instance_free(void *instance) static void eevee_render_to_image(void *vedata, struct RenderEngine *engine, struct RenderLayer *layer, - const struct rcti *UNUSED(rect)) + const struct rcti * /*rect*/) { if (!GPU_shader_storage_buffer_objects_support()) { return; diff --git a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc index 21d1948f03c..cc5a4d56231 100644 --- a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc +++ b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc @@ -201,7 +201,7 @@ PassMain::Sub *ForwardPipeline::material_transparent_add(const Object *ob, void ForwardPipeline::render(View &view, Framebuffer &prepass_fb, Framebuffer &combined_fb, - GPUTexture *UNUSED(combined_tx)) + GPUTexture * /*combined_tx*/) { UNUSED_VARS(view); diff --git a/source/blender/draw/engines/eevee_next/eevee_sync.cc b/source/blender/draw/engines/eevee_next/eevee_sync.cc index 09ea7c9ec3d..f2daba48d7a 100644 --- a/source/blender/draw/engines/eevee_next/eevee_sync.cc +++ b/source/blender/draw/engines/eevee_next/eevee_sync.cc @@ -215,8 +215,8 @@ static void gpencil_drawcall_add(gpIterData &iter, iter.vcount = v_first + v_count - iter.vfirst; } -static void gpencil_stroke_sync(bGPDlayer *UNUSED(gpl), - bGPDframe *UNUSED(gpf), +static void gpencil_stroke_sync(bGPDlayer * /*gpl*/, + bGPDframe * /*gpf*/, bGPDstroke *gps, void *thunk) { diff --git a/source/blender/draw/engines/eevee_next/eevee_velocity.cc b/source/blender/draw/engines/eevee_next/eevee_velocity.cc index e7e4984f7de..b9a78e8547e 100644 --- a/source/blender/draw/engines/eevee_next/eevee_velocity.cc +++ b/source/blender/draw/engines/eevee_next/eevee_velocity.cc @@ -51,8 +51,8 @@ void VelocityModule::init() static void step_object_sync_render(void *velocity, Object *ob, - RenderEngine *UNUSED(engine), - Depsgraph *UNUSED(depsgraph)) + RenderEngine * /*engine*/, + Depsgraph * /*depsgraph*/) { ObjectKey object_key(ob); /* NOTE: Dummy resource handle since this will not be used for drawing. */ diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc index a1a1de328f4..a2aef98a2b6 100644 --- a/source/blender/draw/engines/image/image_engine.cc +++ b/source/blender/draw/engines/image/image_engine.cc @@ -150,7 +150,7 @@ static void IMAGE_cache_init(void *vedata) image_engine.cache_populate(); } -static void IMAGE_cache_populate(void *UNUSED(vedata), Object *UNUSED(ob)) +static void IMAGE_cache_populate(void * /*vedata*/, Object * /*ob*/) { /* Function intentional left empty. `cache_populate` is required to be implemented. */ } diff --git a/source/blender/draw/engines/image/image_space_image.hh b/source/blender/draw/engines/image/image_space_image.hh index 40aa117514c..7609cac8194 100644 --- a/source/blender/draw/engines/image/image_space_image.hh +++ b/source/blender/draw/engines/image/image_space_image.hh @@ -19,7 +19,7 @@ class SpaceImageAccessor : public AbstractSpaceAccessor { { } - Image *get_image(Main *UNUSED(bmain)) override + Image *get_image(Main * /*bmain*/) override { return ED_space_image(sima); } @@ -29,12 +29,12 @@ class SpaceImageAccessor : public AbstractSpaceAccessor { return &sima->iuser; } - ImBuf *acquire_image_buffer(Image *UNUSED(image), void **lock) override + ImBuf *acquire_image_buffer(Image * /*image*/, void **lock) override { return ED_space_image_acquire_buffer(sima, lock, 0); } - void release_buffer(Image *UNUSED(image), ImBuf *image_buffer, void *lock) override + void release_buffer(Image * /*image*/, ImBuf *image_buffer, void *lock) override { ED_space_image_release_buffer(sima, image_buffer, lock); } diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc index dfbf4560271..45bdc9cd123 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.cc +++ b/source/blender/draw/engines/overlay/overlay_armature.cc @@ -1053,7 +1053,7 @@ static void bone_locked_color_shade(float color[4]) } static const float *get_bone_solid_color(const ArmatureDrawContext *ctx, - const EditBone *UNUSED(eBone), + const EditBone * /*eBone*/, const bPoseChannel *pchan, const bArmature *arm, const int boneflag, diff --git a/source/blender/draw/engines/overlay/overlay_facing.cc b/source/blender/draw/engines/overlay/overlay_facing.cc index e40c32b30fc..825036ecd05 100644 --- a/source/blender/draw/engines/overlay/overlay_facing.cc +++ b/source/blender/draw/engines/overlay/overlay_facing.cc @@ -10,7 +10,7 @@ #include "overlay_private.hh" -void OVERLAY_facing_init(OVERLAY_Data *UNUSED(vedata)) +void OVERLAY_facing_init(OVERLAY_Data * /*vedata*/) { } diff --git a/source/blender/draw/engines/overlay/overlay_fade.cc b/source/blender/draw/engines/overlay/overlay_fade.cc index f99e77b75f2..d6fd4f9127a 100644 --- a/source/blender/draw/engines/overlay/overlay_fade.cc +++ b/source/blender/draw/engines/overlay/overlay_fade.cc @@ -12,7 +12,7 @@ #include "overlay_private.hh" -void OVERLAY_fade_init(OVERLAY_Data *UNUSED(vedata)) +void OVERLAY_fade_init(OVERLAY_Data * /*vedata*/) { } diff --git a/source/blender/draw/engines/overlay/overlay_gpencil.cc b/source/blender/draw/engines/overlay/overlay_gpencil.cc index 7e59a513437..30765b30ce6 100644 --- a/source/blender/draw/engines/overlay/overlay_gpencil.cc +++ b/source/blender/draw/engines/overlay/overlay_gpencil.cc @@ -364,8 +364,8 @@ static void OVERLAY_edit_gpencil_cache_populate(OVERLAY_Data *vedata, Object *ob } } -static void overlay_gpencil_draw_stroke_color_name(bGPDlayer *UNUSED(gpl), - bGPDframe *UNUSED(gpf), +static void overlay_gpencil_draw_stroke_color_name(bGPDlayer * /*gpl*/, + bGPDframe * /*gpf*/, bGPDstroke *gps, void *thunk) { diff --git a/source/blender/draw/engines/overlay/overlay_outline.cc b/source/blender/draw/engines/overlay/overlay_outline.cc index af348ae3c3e..00ceb930ba5 100644 --- a/source/blender/draw/engines/overlay/overlay_outline.cc +++ b/source/blender/draw/engines/overlay/overlay_outline.cc @@ -174,8 +174,8 @@ typedef struct iterData { } iterData; static void gpencil_layer_cache_populate(bGPDlayer *gpl, - bGPDframe *UNUSED(gpf), - bGPDstroke *UNUSED(gps), + bGPDframe * /*gpf*/, + bGPDstroke * /*gps*/, void *thunk) { iterData *iter = (iterData *)thunk; @@ -197,8 +197,8 @@ static void gpencil_layer_cache_populate(bGPDlayer *gpl, DRW_shgroup_uniform_vec4_copy(grp, "gpDepthPlane", iter->plane); } -static void gpencil_stroke_cache_populate(bGPDlayer *UNUSED(gpl), - bGPDframe *UNUSED(gpf), +static void gpencil_stroke_cache_populate(bGPDlayer * /*gpl*/, + bGPDframe * /*gpf*/, bGPDstroke *gps, void *thunk) { diff --git a/source/blender/draw/engines/workbench/workbench_shader.cc b/source/blender/draw/engines/workbench/workbench_shader.cc index 9501e653d3b..acfe5adf728 100644 --- a/source/blender/draw/engines/workbench/workbench_shader.cc +++ b/source/blender/draw/engines/workbench/workbench_shader.cc @@ -194,7 +194,7 @@ GPUShader *workbench_shader_composite_get(WORKBENCH_PrivateData *wpd) return *shader; } -GPUShader *workbench_shader_merge_infront_get(WORKBENCH_PrivateData *UNUSED(wpd)) +GPUShader *workbench_shader_merge_infront_get(WORKBENCH_PrivateData * /*wpd*/) { if (e_data.merge_infront_sh == nullptr) { e_data.merge_infront_sh = GPU_shader_create_from_info_name("workbench_merge_infront"); @@ -202,7 +202,7 @@ GPUShader *workbench_shader_merge_infront_get(WORKBENCH_PrivateData *UNUSED(wpd) return e_data.merge_infront_sh; } -GPUShader *workbench_shader_transparent_resolve_get(WORKBENCH_PrivateData *UNUSED(wpd)) +GPUShader *workbench_shader_transparent_resolve_get(WORKBENCH_PrivateData * /*wpd*/) { if (e_data.oit_resolve_sh == nullptr) { e_data.oit_resolve_sh = GPU_shader_create_from_info_name("workbench_transparent_resolve"); diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.cc b/source/blender/draw/intern/draw_cache_impl_mesh.cc index acab4798ea8..5a041493a6a 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.cc +++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc @@ -241,7 +241,7 @@ BLI_INLINE void mesh_cd_layers_type_clear(DRW_MeshCDMask *a) *((uint32_t *)a) = 0; } -static void mesh_cd_calc_edit_uv_layer(const Mesh *UNUSED(me), DRW_MeshCDMask *cd_used) +static void mesh_cd_calc_edit_uv_layer(const Mesh * /*me*/, DRW_MeshCDMask *cd_used) { cd_used->edit_uv = 1; } @@ -1402,8 +1402,7 @@ void DRW_mesh_batch_cache_create_requested(struct TaskGraph *task_graph, } }; #else - auto assert_deps_valid = [&](DRWBatchFlag UNUSED(batch_flag), - Span UNUSED(used_buffer_indices)) {}; + auto assert_deps_valid = [&](DRWBatchFlag /*batch_flag*/, Span /*used_buffer_indices*/) {}; #endif diff --git a/source/blender/draw/intern/draw_cache_impl_pointcloud.cc b/source/blender/draw/intern/draw_cache_impl_pointcloud.cc index 72be5b37652..9a8f48b33fa 100644 --- a/source/blender/draw/intern/draw_cache_impl_pointcloud.cc +++ b/source/blender/draw/intern/draw_cache_impl_pointcloud.cc @@ -304,7 +304,7 @@ GPUBatch *DRW_pointcloud_batch_cache_get_surface_viewer_attribute(Object *ob) } GPUBatch **DRW_cache_pointcloud_surface_shaded_get(Object *ob, - struct GPUMaterial **UNUSED(gpumat_array), + struct GPUMaterial ** /*gpumat_array*/, uint gpumat_array_len) { PointCloud &pointcloud = *static_cast(ob->data); diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index e494f9f4632..131e6c7a2af 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -903,13 +903,13 @@ static bool draw_subdiv_topology_info_cb(const SubdivForeachContext *foreach_con } static void draw_subdiv_vertex_corner_cb(const SubdivForeachContext *foreach_context, - void *UNUSED(tls), - const int UNUSED(ptex_face_index), - const float UNUSED(u), - const float UNUSED(v), + void * /*tls*/, + const int /*ptex_face_index*/, + const float /*u*/, + const float /*v*/, const int coarse_vertex_index, - const int UNUSED(coarse_poly_index), - const int UNUSED(coarse_corner), + const int /*coarse_poly_index*/, + const int /*coarse_corner*/, const int subdiv_vertex_index) { BLI_assert(coarse_vertex_index != ORIGINDEX_NONE); @@ -917,26 +917,26 @@ static void draw_subdiv_vertex_corner_cb(const SubdivForeachContext *foreach_con ctx->vert_origindex_map[subdiv_vertex_index] = coarse_vertex_index; } -static void draw_subdiv_vertex_edge_cb(const SubdivForeachContext *UNUSED(foreach_context), - void *UNUSED(tls_v), - const int UNUSED(ptex_face_index), - const float UNUSED(u), - const float UNUSED(v), - const int UNUSED(coarse_edge_index), - const int UNUSED(coarse_poly_index), - const int UNUSED(coarse_corner), - const int UNUSED(subdiv_vertex_index)) +static void draw_subdiv_vertex_edge_cb(const SubdivForeachContext * /*foreach_context*/, + void * /*tls_v*/, + const int /*ptex_face_index*/, + const float /*u*/, + const float /*v*/, + const int /*coarse_edge_index*/, + const int /*coarse_poly_index*/, + const int /*coarse_corner*/, + const int /*subdiv_vertex_index*/) { /* Required if SubdivForeachContext.vertex_corner is also set. */ } static void draw_subdiv_edge_cb(const SubdivForeachContext *foreach_context, - void *UNUSED(tls), + void * /*tls*/, const int coarse_edge_index, const int subdiv_edge_index, - const bool UNUSED(is_loose), - const int UNUSED(subdiv_v1), - const int UNUSED(subdiv_v2)) + const bool /*is_loose*/, + const int /*subdiv_v1*/, + const int /*subdiv_v2*/) { DRWCacheBuildingContext *ctx = (DRWCacheBuildingContext *)(foreach_context->user_data); @@ -956,13 +956,13 @@ static void draw_subdiv_edge_cb(const SubdivForeachContext *foreach_context, } static void draw_subdiv_loop_cb(const SubdivForeachContext *foreach_context, - void *UNUSED(tls_v), + void * /*tls_v*/, const int ptex_face_index, const float u, const float v, - const int UNUSED(coarse_loop_index), + const int /*coarse_loop_index*/, const int coarse_poly_index, - const int UNUSED(coarse_corner), + const int /*coarse_corner*/, const int subdiv_loop_index, const int subdiv_vertex_index, const int subdiv_edge_index) diff --git a/source/blender/draw/intern/draw_hair.cc b/source/blender/draw/intern/draw_hair.cc index ceee1c7cb48..4e44967e5e9 100644 --- a/source/blender/draw/intern/draw_hair.cc +++ b/source/blender/draw/intern/draw_hair.cc @@ -202,8 +202,8 @@ GPUVertBuf *DRW_hair_pos_buffer_get(Object *object, ParticleSystem *psys, Modifi } void DRW_hair_duplimat_get(Object *object, - ParticleSystem *UNUSED(psys), - ModifierData *UNUSED(md), + ParticleSystem * /*psys*/, + ModifierData * /*md*/, float (*dupli_mat)[4]) { Object *dupli_parent = DRW_object_get_dupli_parent(object); diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc index 25d56ea7a72..f5990010e9a 100644 --- a/source/blender/draw/intern/draw_manager_data.cc +++ b/source/blender/draw/intern/draw_manager_data.cc @@ -767,7 +767,7 @@ static DRWResourceHandle drw_resource_handle_new(float (*obmat)[4], Object *ob) return handle; } -uint32_t DRW_object_resource_id_get(Object *UNUSED(ob)) +uint32_t DRW_object_resource_id_get(Object * /*ob*/) { DRWResourceHandle handle = DST.ob_handle; if (handle == 0) { diff --git a/source/blender/draw/intern/draw_shader.cc b/source/blender/draw/intern/draw_shader.cc index 960348b4a94..dc08fa76335 100644 --- a/source/blender/draw/intern/draw_shader.cc +++ b/source/blender/draw/intern/draw_shader.cc @@ -32,13 +32,12 @@ static struct { /** \name Hair refinement * \{ */ -static GPUShader *hair_refine_shader_compute_create(ParticleRefineShader UNUSED(refinement)) +static GPUShader *hair_refine_shader_compute_create(ParticleRefineShader /*refinement*/) { return GPU_shader_create_from_info_name("draw_hair_refine_compute"); } -static GPUShader *hair_refine_shader_transform_feedback_create( - ParticleRefineShader UNUSED(refinement)) +static GPUShader *hair_refine_shader_transform_feedback_create(ParticleRefineShader /*refinement*/) { GPUShader *sh = nullptr; @@ -58,7 +57,7 @@ static GPUShader *hair_refine_shader_transform_feedback_create( } static GPUShader *hair_refine_shader_transform_feedback_workaround_create( - ParticleRefineShader UNUSED(refinement)) + ParticleRefineShader /*refinement*/) { return GPU_shader_create_from_info_name("draw_hair_refine_transform_feedback_workaround"); } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc index bf8dd1a51f8..be919b1af67 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc @@ -22,8 +22,8 @@ struct MeshExtract_EditUvElem_Data { }; static void extract_edituv_tris_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast(tls_data); @@ -39,9 +39,9 @@ BLI_INLINE void edituv_tri_add( } } -static void extract_edituv_tris_iter_looptri_bm(const MeshRenderData *UNUSED(mr), +static void extract_edituv_tris_iter_looptri_bm(const MeshRenderData * /*mr*/, BMLoop **elt, - const int UNUSED(elt_index), + const int /*elt_index*/, void *_data) { MeshExtract_EditUvElem_Data *data = static_cast(_data); @@ -55,7 +55,7 @@ static void extract_edituv_tris_iter_looptri_bm(const MeshRenderData *UNUSED(mr) static void extract_edituv_tris_iter_looptri_mesh(const MeshRenderData *mr, const MLoopTri *mlt, - const int UNUSED(elt_index), + const int /*elt_index*/, void *_data) { MeshExtract_EditUvElem_Data *data = static_cast(_data); @@ -66,8 +66,8 @@ static void extract_edituv_tris_iter_looptri_mesh(const MeshRenderData *mr, edituv_tri_add(data, mp_hidden, mp_select, mlt->tri[0], mlt->tri[1], mlt->tri[2]); } -static void extract_edituv_tris_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_tris_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -78,8 +78,8 @@ static void extract_edituv_tris_finish(const MeshRenderData *UNUSED(mr), static void extract_edituv_tris_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast(tls_data); @@ -90,8 +90,8 @@ static void extract_edituv_tris_init_subdiv(const DRWSubdivCache *subdiv_cache, data->sync_selection = (mr->toolsettings->uv_flag & UV_SYNC_SELECTION) != 0; } -static void extract_edituv_tris_iter_subdiv_bm(const DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *UNUSED(mr), +static void extract_edituv_tris_iter_subdiv_bm(const DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData * /*mr*/, void *_data, uint subdiv_quad_index, const BMFace *coarse_quad) @@ -114,7 +114,7 @@ static void extract_edituv_tris_iter_subdiv_bm(const DRWSubdivCache *UNUSED(subd loop_idx + 3); } -static void extract_edituv_tris_iter_subdiv_mesh(const DRWSubdivCache *UNUSED(subdiv_cache), +static void extract_edituv_tris_iter_subdiv_mesh(const DRWSubdivCache * /*subdiv_cache*/, const MeshRenderData *mr, void *_data, uint subdiv_quad_index, @@ -131,9 +131,9 @@ static void extract_edituv_tris_iter_subdiv_mesh(const DRWSubdivCache *UNUSED(su edituv_tri_add(data, mp_hidden, mp_select, loop_idx, loop_idx + 2, loop_idx + 3); } -static void extract_edituv_tris_finish_subdiv(const struct DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_tris_finish_subdiv(const struct DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -167,8 +167,8 @@ constexpr MeshExtract create_extractor_edituv_tris() * \{ */ static void extract_edituv_lines_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast(tls_data); @@ -184,9 +184,9 @@ BLI_INLINE void edituv_edge_add( } } -static void extract_edituv_lines_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_edituv_lines_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_EditUvElem_Data *data = static_cast(_data); @@ -234,8 +234,8 @@ static void extract_edituv_lines_iter_poly_mesh(const MeshRenderData *mr, } } -static void extract_edituv_lines_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_lines_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -246,8 +246,8 @@ static void extract_edituv_lines_finish(const MeshRenderData *UNUSED(mr), static void extract_edituv_lines_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast(tls_data); @@ -318,9 +318,9 @@ static void extract_edituv_lines_iter_subdiv_mesh(const DRWSubdivCache *subdiv_c } } -static void extract_edituv_lines_finish_subdiv(const struct DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_lines_finish_subdiv(const struct DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -354,8 +354,8 @@ constexpr MeshExtract create_extractor_edituv_lines() * \{ */ static void extract_edituv_points_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast(tls_data); @@ -373,9 +373,9 @@ BLI_INLINE void edituv_point_add(MeshExtract_EditUvElem_Data *data, } } -static void extract_edituv_points_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_edituv_points_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_EditUvElem_Data *data = static_cast(_data); @@ -410,8 +410,8 @@ static void extract_edituv_points_iter_poly_mesh(const MeshRenderData *mr, } } -static void extract_edituv_points_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_points_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -422,8 +422,8 @@ static void extract_edituv_points_finish(const MeshRenderData *UNUSED(mr), static void extract_edituv_points_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast(tls_data); @@ -433,7 +433,7 @@ static void extract_edituv_points_init_subdiv(const DRWSubdivCache *subdiv_cache } static void extract_edituv_points_iter_subdiv_bm(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, void *_data, uint subdiv_quad_index, const BMFace *coarse_quad) @@ -475,9 +475,9 @@ static void extract_edituv_points_iter_subdiv_mesh(const DRWSubdivCache *subdiv_ } } -static void extract_edituv_points_finish_subdiv(const struct DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_points_finish_subdiv(const struct DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -511,8 +511,8 @@ constexpr MeshExtract create_extractor_edituv_points() * \{ */ static void extract_edituv_fdots_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast(tls_data); @@ -533,7 +533,7 @@ BLI_INLINE void edituv_facedot_add(MeshExtract_EditUvElem_Data *data, } } -static void extract_edituv_fdots_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_edituv_fdots_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, const int f_index, void *_data) @@ -575,8 +575,8 @@ static void extract_edituv_fdots_iter_poly_mesh(const MeshRenderData *mr, } } -static void extract_edituv_fdots_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_fdots_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc index 8dc00617039..d964f608e52 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc @@ -15,15 +15,15 @@ namespace blender::draw { * \{ */ static void extract_fdots_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { GPUIndexBufBuilder *elb = static_cast(tls_data); GPU_indexbuf_init(elb, GPU_PRIM_POINTS, mr->poly_len, mr->poly_len); } -static void extract_fdots_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_fdots_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, const int f_index, void *_userdata) @@ -69,8 +69,8 @@ static void extract_fdots_iter_poly_mesh(const MeshRenderData *mr, } } -static void extract_fdots_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_fdots_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_userdata) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc index 6b7d42ec67c..56e8baaca22 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc @@ -18,8 +18,8 @@ namespace blender::draw { * \{ */ static void extract_lines_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { GPUIndexBufBuilder *elb = static_cast(tls_data); @@ -28,9 +28,9 @@ static void extract_lines_init(const MeshRenderData *mr, elb, GPU_PRIM_LINES, mr->edge_len + mr->edge_loose_len, mr->loop_len + mr->loop_loose_len); } -static void extract_lines_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_lines_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { GPUIndexBufBuilder *elb = static_cast(data); @@ -52,7 +52,7 @@ static void extract_lines_iter_poly_bm(const MeshRenderData *UNUSED(mr), static void extract_lines_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *data) { GPUIndexBufBuilder *elb = static_cast(data); @@ -127,8 +127,8 @@ static void extract_lines_task_reduce(void *_userdata_to, void *_userdata_from) GPU_indexbuf_join(elb_to, elb_from); } -static void extract_lines_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_lines_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *data) { @@ -138,10 +138,10 @@ static void extract_lines_finish(const MeshRenderData *UNUSED(mr), } static void extract_lines_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; GPUIndexBuf *ibo = static_cast(buffer); @@ -158,7 +158,7 @@ static void extract_lines_init_subdiv(const DRWSubdivCache *subdiv_cache, static void extract_lines_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; if (loose_geom.edge_len == 0) { @@ -284,10 +284,10 @@ static void extract_lines_with_lines_loose_finish(const MeshRenderData *mr, } static void extract_lines_with_lines_loose_finish_subdiv(const struct DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, - void *UNUSED(buf), - void *UNUSED(_data)) + void * /*buf*/, + void * /*_data*/) { /* Multiply by 2 because these are edges indices. */ const int start = subdiv_cache->num_subdiv_loops * 2; @@ -326,18 +326,18 @@ constexpr MeshExtract create_extractor_lines_with_lines_loose() static void extract_lines_loose_only_init(const MeshRenderData *mr, MeshBatchCache *cache, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { BLI_assert(buf == cache->final.buff.ibo.lines_loose); UNUSED_VARS_NDEBUG(buf); extract_lines_loose_subbuffer(mr, cache); } -static void extract_lines_loose_only_init_subdiv(const DRWSubdivCache *UNUSED(subdiv_cache), +static void extract_lines_loose_only_init_subdiv(const DRWSubdivCache * /*subdiv_cache*/, const MeshRenderData *mr, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { BLI_assert(buffer == cache->final.buff.ibo.lines_loose); UNUSED_VARS_NDEBUG(buffer); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc index 32a262e4533..3124a35608d 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc @@ -42,8 +42,8 @@ static void line_adjacency_data_init(MeshExtract_LineAdjacency_Data *data, } static void extract_lines_adjacency_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { /* Similar to poly_to_tri_count(). @@ -96,9 +96,9 @@ BLI_INLINE void lines_adjacency_triangle( } } -static void extract_lines_adjacency_iter_looptri_bm(const MeshRenderData *UNUSED(mr), +static void extract_lines_adjacency_iter_looptri_bm(const MeshRenderData * /*mr*/, BMLoop **elt, - const int UNUSED(elt_index), + const int /*elt_index*/, void *_data) { MeshExtract_LineAdjacency_Data *data = static_cast(_data); @@ -115,7 +115,7 @@ static void extract_lines_adjacency_iter_looptri_bm(const MeshRenderData *UNUSED static void extract_lines_adjacency_iter_looptri_mesh(const MeshRenderData *mr, const MLoopTri *mlt, - const int UNUSED(elt_index), + const int /*elt_index*/, void *_data) { MeshExtract_LineAdjacency_Data *data = static_cast(_data); @@ -132,7 +132,7 @@ static void extract_lines_adjacency_iter_looptri_mesh(const MeshRenderData *mr, data); } -static void extract_lines_adjacency_finish(const MeshRenderData *UNUSED(mr), +static void extract_lines_adjacency_finish(const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buf, void *_data) @@ -166,9 +166,9 @@ static void extract_lines_adjacency_finish(const MeshRenderData *UNUSED(mr), } static void extract_lines_adjacency_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, + void * /*buf*/, void *_data) { MeshExtract_LineAdjacency_Data *data = static_cast(_data); @@ -182,7 +182,7 @@ static void extract_lines_adjacency_init_subdiv(const DRWSubdivCache *subdiv_cac } static void extract_lines_adjacency_iter_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, void *_data, uint subdiv_quad_index) { @@ -207,7 +207,7 @@ static void extract_lines_adjacency_iter_subdiv_bm(const DRWSubdivCache *subdiv_ const MeshRenderData *mr, void *_data, uint subdiv_quad_index, - const BMFace *UNUSED(coarse_quad)) + const BMFace * /*coarse_quad*/) { extract_lines_adjacency_iter_subdiv(subdiv_cache, mr, _data, subdiv_quad_index); } @@ -216,12 +216,12 @@ static void extract_lines_adjacency_iter_subdiv_mesh(const DRWSubdivCache *subdi const MeshRenderData *mr, void *_data, uint subdiv_quad_index, - const MPoly *UNUSED(coarse_quad)) + const MPoly * /*coarse_quad*/) { extract_lines_adjacency_iter_subdiv(subdiv_cache, mr, _data, subdiv_quad_index); } -static void extract_lines_adjacency_finish_subdiv(const DRWSubdivCache *UNUSED(subdiv_cache), +static void extract_lines_adjacency_finish_subdiv(const DRWSubdivCache * /*subdiv_cache*/, const MeshRenderData *mr, MeshBatchCache *cache, void *buf, diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc index 3977ba492ca..572eb5b28f8 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc @@ -26,8 +26,8 @@ struct MeshExtract_LinePaintMask_Data { }; static void extract_lines_paint_mask_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { MeshExtract_LinePaintMask_Data *data = static_cast(tls_data); @@ -75,8 +75,8 @@ static void extract_lines_paint_mask_iter_poly_mesh(const MeshRenderData *mr, } } -static void extract_lines_paint_mask_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_lines_paint_mask_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -88,8 +88,8 @@ static void extract_lines_paint_mask_finish(const MeshRenderData *UNUSED(mr), static void extract_lines_paint_mask_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { MeshExtract_LinePaintMask_Data *data = static_cast(tls_data); @@ -150,12 +150,11 @@ static void extract_lines_paint_mask_iter_subdiv_mesh(const DRWSubdivCache *subd } } -static void extract_lines_paint_mask_finish_subdiv( - const struct DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *mr, - MeshBatchCache *cache, - void *buf, - void *_data) +static void extract_lines_paint_mask_finish_subdiv(const struct DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData *mr, + MeshBatchCache *cache, + void *buf, + void *_data) { extract_lines_paint_mask_finish(mr, cache, buf, _data); } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc index 48eeb86e5ee..e84f122d03e 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc @@ -19,8 +19,8 @@ namespace blender::draw { * \{ */ static void extract_points_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { GPUIndexBufBuilder *elb = static_cast(tls_data); @@ -53,9 +53,9 @@ BLI_INLINE void vert_set_mesh(GPUIndexBufBuilder *elb, } } -static void extract_points_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_points_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_userdata) { GPUIndexBufBuilder *elb = static_cast(_userdata); @@ -70,7 +70,7 @@ static void extract_points_iter_poly_bm(const MeshRenderData *UNUSED(mr), static void extract_points_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *_userdata) { GPUIndexBufBuilder *elb = static_cast(_userdata); @@ -113,7 +113,7 @@ static void extract_points_iter_lvert_bm(const MeshRenderData *mr, } static void extract_points_iter_lvert_mesh(const MeshRenderData *mr, - const MVert *UNUSED(mv), + const MVert * /*mv*/, const int lvert_index, void *_userdata) { @@ -129,8 +129,8 @@ static void extract_points_task_reduce(void *_userdata_to, void *_userdata_from) GPU_indexbuf_join(elb_to, elb_from); } -static void extract_points_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_points_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_userdata) { @@ -141,8 +141,8 @@ static void extract_points_finish(const MeshRenderData *UNUSED(mr), static void extract_points_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buffer), + MeshBatchCache * /*cache*/, + void * /*buffer*/, void *data) { GPUIndexBufBuilder *elb = static_cast(data); @@ -194,7 +194,7 @@ static void extract_points_iter_subdiv_bm(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, void *_data, uint subdiv_quad_index, - const BMFace *UNUSED(coarse_quad)) + const BMFace * /*coarse_quad*/) { GPUIndexBufBuilder *elb = static_cast(_data); extract_points_iter_subdiv_common(elb, mr, subdiv_cache, subdiv_quad_index, true); @@ -204,7 +204,7 @@ static void extract_points_iter_subdiv_mesh(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, void *_data, uint subdiv_quad_index, - const MPoly *UNUSED(coarse_quad)) + const MPoly * /*coarse_quad*/) { GPUIndexBufBuilder *elb = static_cast(_data); extract_points_iter_subdiv_common(elb, mr, subdiv_cache, subdiv_quad_index, false); @@ -212,7 +212,7 @@ static void extract_points_iter_subdiv_mesh(const DRWSubdivCache *subdiv_cache, static void extract_points_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - void *UNUSED(buffer), + void * /*buffer*/, void *data) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; @@ -281,9 +281,9 @@ static void extract_points_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, } } -static void extract_points_finish_subdiv(const DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_points_finish_subdiv(const DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_userdata) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc index 2e3e6c7b6b1..da3560389e4 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc @@ -25,8 +25,8 @@ static void extract_tris_mat_task_reduce(void *_userdata_to, void *_userdata_fro * \{ */ static void extract_tris_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { GPUIndexBufBuilder *elb = static_cast(tls_data); @@ -110,10 +110,10 @@ static void extract_tris_finish(const MeshRenderData *mr, } static void extract_tris_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { GPUIndexBuf *ibo = static_cast(buffer); /* Initialize the index buffer, it was already allocated, it will be filled on the device. */ @@ -157,15 +157,15 @@ constexpr MeshExtract create_extractor_tris() * \{ */ static void extract_tris_single_mat_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { GPUIndexBufBuilder *elb = static_cast(tls_data); GPU_indexbuf_init(elb, GPU_PRIM_TRIS, mr->tri_len, mr->loop_len); } -static void extract_tris_single_mat_iter_looptri_bm(const MeshRenderData *UNUSED(mr), +static void extract_tris_single_mat_iter_looptri_bm(const MeshRenderData * /*mr*/, BMLoop **elt, const int elt_index, void *_data) diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc index c602b768df9..1817591b6a3 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc @@ -280,7 +280,7 @@ static void extract_attr_generic(const MeshRenderData *mr, } static void extract_attr_init( - const MeshRenderData *mr, MeshBatchCache *cache, void *buf, void *UNUSED(tls_data), int index) + const MeshRenderData *mr, MeshBatchCache *cache, void *buf, void * /*tls_data*/, int index) { const DRW_Attributes *attrs_used = &cache->attr_used; const DRW_AttributeRequest &request = attrs_used->requests[index]; @@ -327,7 +327,7 @@ static void extract_attr_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, MeshBatchCache *cache, void *buffer, - void *UNUSED(tls_data), + void * /*tls_data*/, int index) { const DRW_Attributes *attrs_used = &cache->attr_used; @@ -435,9 +435,9 @@ constexpr MeshExtract create_extractor_attr(ExtractInitFn fn, ExtractInitSubdivF } static void extract_mesh_attr_viewer_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast(buf); static GPUVertFormat format = {0}; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc index 50c37f6397c..a968bd07c87 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc @@ -43,7 +43,7 @@ static float loop_edge_factor_get(const float f_no[3], } static void extract_edge_fac_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -82,7 +82,7 @@ static void extract_edge_fac_init(const MeshRenderData *mr, static void extract_edge_fac_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_EdgeFac_Data *data = static_cast(_data); @@ -146,7 +146,7 @@ static void extract_edge_fac_iter_poly_mesh(const MeshRenderData *mr, } static void extract_edge_fac_iter_ledge_bm(const MeshRenderData *mr, - const BMEdge *UNUSED(eed), + const BMEdge * /*eed*/, const int ledge_index, void *_data) { @@ -156,7 +156,7 @@ static void extract_edge_fac_iter_ledge_bm(const MeshRenderData *mr, } static void extract_edge_fac_iter_ledge_mesh(const MeshRenderData *mr, - const MEdge *UNUSED(med), + const MEdge * /*med*/, const int ledge_index, void *_data) { @@ -167,7 +167,7 @@ static void extract_edge_fac_iter_ledge_mesh(const MeshRenderData *mr, } static void extract_edge_fac_finish(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -217,10 +217,10 @@ static GPUVertFormat *get_subdiv_edge_fac_format() } static void extract_edge_fac_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; GPUVertBuf *edge_idx = cache->final.buff.vbo.edge_idx; @@ -252,9 +252,9 @@ static void extract_edge_fac_init_subdiv(const DRWSubdivCache *subdiv_cache, } static void extract_edge_fac_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; if (loose_geom.edge_len == 0) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc index 097e45ad3ee..31dc2fdff6a 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc @@ -112,7 +112,7 @@ static GPUVertFormat *get_edit_data_format() } static void extract_edit_data_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -126,7 +126,7 @@ static void extract_edit_data_init(const MeshRenderData *mr, static void extract_edit_data_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { EditLoopData *vbo_data = *(EditLoopData **)_data; @@ -223,7 +223,7 @@ static void extract_edit_data_iter_lvert_bm(const MeshRenderData *mr, } static void extract_edit_data_iter_lvert_mesh(const MeshRenderData *mr, - const MVert *UNUSED(mv), + const MVert * /*mv*/, const int lvert_index, void *_data) { @@ -240,8 +240,8 @@ static void extract_edit_data_iter_lvert_mesh(const MeshRenderData *mr, } static void extract_edit_data_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *data) { @@ -307,7 +307,7 @@ static void extract_edit_data_iter_subdiv_mesh(const DRWSubdivCache *subdiv_cach static void extract_edit_data_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - void *UNUSED(buffer), + void * /*buffer*/, void *_data) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc index 504d4a6956a..3ebf2daf1e9 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc @@ -43,7 +43,7 @@ static void extract_edituv_data_init_common(const MeshRenderData *mr, } static void extract_edituv_data_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -54,7 +54,7 @@ static void extract_edituv_data_init(const MeshRenderData *mr, static void extract_edituv_data_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { BMLoop *l_iter, *l_first; @@ -114,7 +114,7 @@ static void extract_edituv_data_iter_poly_mesh(const MeshRenderData *mr, static void extract_edituv_data_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc index 683abf24f03..492756f30bb 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc @@ -74,7 +74,7 @@ static void edituv_get_edituv_stretch_angle(float auv[2][2], } static void extract_edituv_stretch_angle_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -104,7 +104,7 @@ static void extract_edituv_stretch_angle_init(const MeshRenderData *mr, static void extract_edituv_stretch_angle_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_StretchAngle_Data *data = static_cast(_data); @@ -157,7 +157,7 @@ static void extract_edituv_stretch_angle_iter_poly_bm(const MeshRenderData *mr, static void extract_edituv_stretch_angle_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *_data) { MeshExtract_StretchAngle_Data *data = static_cast(_data); @@ -214,7 +214,7 @@ static void extract_edituv_stretch_angle_init_subdiv(const DRWSubdivCache *subdi const MeshRenderData *mr, MeshBatchCache *cache, void *buffer, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *refined_vbo = static_cast(buffer); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc index 9679c0523f8..7c96fbd6a99 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc @@ -20,9 +20,9 @@ namespace blender::draw { * \{ */ static void extract_edituv_stretch_area_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast(buf); static GPUVertFormat format = {0}; @@ -90,7 +90,7 @@ static void compute_area_ratio(const MeshRenderData *mr, static void extract_edituv_stretch_area_finish(const MeshRenderData *mr, MeshBatchCache *cache, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast(buf); float *area_ratio = static_cast(MEM_mallocN(sizeof(float) * mr->poly_len, __func__)); @@ -126,7 +126,7 @@ static void extract_edituv_stretch_area_init_subdiv(const DRWSubdivCache *subdiv const MeshRenderData *mr, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { /* Initialize final buffer. */ diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc index 27d1975d67b..55ad2e67487 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc @@ -21,7 +21,7 @@ struct MeshExtract_EditUVFdotData_Data { }; static void extract_fdots_edituv_data_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -41,7 +41,7 @@ static void extract_fdots_edituv_data_init(const MeshRenderData *mr, static void extract_fdots_edituv_data_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_EditUVFdotData_Data *data = static_cast(_data); @@ -51,7 +51,7 @@ static void extract_fdots_edituv_data_iter_poly_bm(const MeshRenderData *mr, } static void extract_fdots_edituv_data_iter_poly_mesh(const MeshRenderData *mr, - const MPoly *UNUSED(mp), + const MPoly * /*mp*/, const int mp_index, void *_data) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc index c47cde63630..02e4b877562 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc @@ -19,9 +19,9 @@ namespace blender::draw { #define NOR_AND_FLAG_HIDDEN -2 static void extract_fdots_nor_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast(buf); static GPUVertFormat format = {0}; @@ -34,9 +34,9 @@ static void extract_fdots_nor_init(const MeshRenderData *mr, } static void extract_fdots_nor_finish(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast(buf); static float invalid_normal[3] = {0.0f, 0.0f, 0.0f}; @@ -99,9 +99,9 @@ constexpr MeshExtract create_extractor_fdots_nor() * \{ */ static void extract_fdots_nor_hq_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast(buf); static GPUVertFormat format = {0}; @@ -114,9 +114,9 @@ static void extract_fdots_nor_hq_init(const MeshRenderData *mr, } static void extract_fdots_nor_hq_finish(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast(buf); static float invalid_normal[3] = {0.0f, 0.0f, 0.0f}; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc index 8bc4d7fe7c7..6d93a482623 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc @@ -36,7 +36,7 @@ static GPUVertFormat *get_fdots_nor_format_subdiv() } static void extract_fdots_pos_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -100,10 +100,10 @@ static void extract_fdots_pos_iter_poly_mesh(const MeshRenderData *mr, } static void extract_fdots_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { /* We "extract" positions, normals, and indices at once. */ GPUVertBuf *fdots_pos_vbo = static_cast(buffer); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc index 0c1b58a035f..96240af2ee6 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc @@ -22,7 +22,7 @@ struct MeshExtract_FdotUV_Data { }; static void extract_fdots_uv_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -53,9 +53,9 @@ static void extract_fdots_uv_init(const MeshRenderData *mr, } } -static void extract_fdots_uv_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_fdots_uv_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_FdotUV_Data *data = static_cast(_data); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc index b27d6577877..ff0d502ea1e 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc @@ -16,7 +16,7 @@ namespace blender::draw { * \{ */ static void extract_lnor_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -34,7 +34,7 @@ static void extract_lnor_init(const MeshRenderData *mr, static void extract_lnor_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { BMLoop *l_iter, *l_first; @@ -106,10 +106,10 @@ static GPUVertFormat *get_subdiv_lnor_format() } static void extract_lnor_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast(buffer); GPUVertBuf *pos_nor = cache->final.buff.vbo.pos_nor; @@ -143,7 +143,7 @@ struct gpuHQNor { }; static void extract_lnor_hq_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -161,7 +161,7 @@ static void extract_lnor_hq_init(const MeshRenderData *mr, static void extract_lnor_hq_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { BMLoop *l_iter, *l_first; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc index a803fcaac1c..d0d97054448 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc @@ -23,9 +23,9 @@ namespace blender::draw { * \{ */ static void extract_mesh_analysis_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast(buf); static GPUVertFormat format = {0}; @@ -265,7 +265,7 @@ struct BVHTree_OverlapData { float epsilon; }; -static bool bvh_overlap_cb(void *userdata, int index_a, int index_b, int UNUSED(thread)) +static bool bvh_overlap_cb(void *userdata, int index_a, int index_b, int /*thread*/) { struct BVHTree_OverlapData *data = static_cast(userdata); @@ -367,7 +367,7 @@ static void statvis_calc_intersect(const MeshRenderData *mr, float *r_intersect) } } -BLI_INLINE float distort_remap(float fac, float min, float UNUSED(max), float minmax_irange) +BLI_INLINE float distort_remap(float fac, float min, float /*max*/, float minmax_irange) { if (fac >= min) { fac = (fac - min) * minmax_irange; @@ -474,7 +474,7 @@ static void statvis_calc_distort(const MeshRenderData *mr, float *r_distort) } } -BLI_INLINE float sharp_remap(float fac, float min, float UNUSED(max), float minmax_irange) +BLI_INLINE float sharp_remap(float fac, float min, float /*max*/, float minmax_irange) { /* important not '>=' */ if (fac > min) { @@ -588,9 +588,9 @@ static void statvis_calc_sharp(const MeshRenderData *mr, float *r_sharp) } static void extract_analysis_iter_finish_mesh(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast(buf); BLI_assert(mr->edit_bmesh); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc index 4fcbdb1fc7c..915495204d4 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc @@ -19,7 +19,7 @@ struct MeshExtract_Orco_Data { }; static void extract_orco_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -45,9 +45,9 @@ static void extract_orco_init(const MeshRenderData *mr, BLI_assert(data->orco); } -static void extract_orco_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_orco_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { MeshExtract_Orco_Data *orco_data = (MeshExtract_Orco_Data *)data; @@ -63,7 +63,7 @@ static void extract_orco_iter_poly_bm(const MeshRenderData *UNUSED(mr), static void extract_orco_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *data) { const MLoop *mloop = mr->mloop; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc index 9d8197964ee..30b4f808487 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc @@ -28,7 +28,7 @@ struct MeshExtract_PosNor_Data { }; static void extract_pos_nor_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -66,7 +66,7 @@ static void extract_pos_nor_init(const MeshRenderData *mr, static void extract_pos_nor_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_PosNor_Data *data = static_cast(_data); @@ -171,9 +171,9 @@ static void extract_pos_nor_iter_lvert_mesh(const MeshRenderData *mr, vert->nor = data->normals[v_index].low; } -static void extract_pos_nor_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), +static void extract_pos_nor_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, + void * /*buf*/, void *_data) { MeshExtract_PosNor_Data *data = static_cast(_data); @@ -201,10 +201,10 @@ static GPUVertFormat *get_custom_normals_format() } static void extract_pos_nor_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast(buffer); const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; @@ -282,9 +282,9 @@ static void extract_pos_nor_init_subdiv(const DRWSubdivCache *subdiv_cache, } static void extract_pos_nor_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; if (loose_geom.loop_len == 0) { @@ -373,7 +373,7 @@ struct MeshExtract_PosNorHQ_Data { }; static void extract_pos_nor_hq_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -411,7 +411,7 @@ static void extract_pos_nor_hq_init(const MeshRenderData *mr, static void extract_pos_nor_hq_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_PosNorHQ_Data *data = static_cast(_data); @@ -429,7 +429,7 @@ static void extract_pos_nor_hq_iter_poly_bm(const MeshRenderData *mr, static void extract_pos_nor_hq_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *_data) { MeshExtract_PosNorHQ_Data *data = static_cast(_data); @@ -523,9 +523,9 @@ static void extract_pos_nor_hq_iter_lvert_mesh(const MeshRenderData *mr, vert->nor[3] = 0; } -static void extract_pos_nor_hq_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), +static void extract_pos_nor_hq_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, + void * /*buf*/, void *_data) { MeshExtract_PosNorHQ_Data *data = static_cast(_data); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc index b33071f1d56..34b8124f872 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc @@ -32,9 +32,9 @@ static GPUVertFormat *get_sculpt_data_format() } static void extract_sculpt_data_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast(buf); GPUVertFormat *format = get_sculpt_data_format(); @@ -115,9 +115,9 @@ static void extract_sculpt_data_init(const MeshRenderData *mr, static void extract_sculpt_data_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buffer, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast(buffer); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc index 9e0d171c9e4..5c196a67d0b 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc @@ -14,7 +14,7 @@ namespace blender::draw { /** \name Extract Selection Index * \{ */ -static void extract_select_idx_init_impl(const MeshRenderData *UNUSED(mr), +static void extract_select_idx_init_impl(const MeshRenderData * /*mr*/, const int len, void *buf, void *tls_data) @@ -30,7 +30,7 @@ static void extract_select_idx_init_impl(const MeshRenderData *UNUSED(mr), } static void extract_select_idx_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -42,7 +42,7 @@ static void extract_select_idx_init(const MeshRenderData *mr, * index VBO's. We could upload the p/e/v_origindex as a buffer texture and sample it inside the * shader to output original index. */ -static void extract_poly_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_poly_idx_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, const int f_index, void *data) @@ -55,9 +55,9 @@ static void extract_poly_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), } while ((l_iter = l_iter->next) != l_first); } -static void extract_edge_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_edge_idx_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { BMLoop *l_iter, *l_first; @@ -68,9 +68,9 @@ static void extract_edge_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), } while ((l_iter = l_iter->next) != l_first); } -static void extract_vert_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_vert_idx_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { BMLoop *l_iter, *l_first; @@ -122,7 +122,7 @@ static void extract_poly_idx_iter_poly_mesh(const MeshRenderData *mr, static void extract_edge_idx_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *data) { const MLoop *mloop = mr->mloop; @@ -135,7 +135,7 @@ static void extract_edge_idx_iter_poly_mesh(const MeshRenderData *mr, static void extract_vert_idx_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *data) { const MLoop *mloop = mr->mloop; @@ -147,7 +147,7 @@ static void extract_vert_idx_iter_poly_mesh(const MeshRenderData *mr, } static void extract_edge_idx_iter_ledge_mesh(const MeshRenderData *mr, - const MEdge *UNUSED(med), + const MEdge * /*med*/, const int ledge_index, void *data) { @@ -169,7 +169,7 @@ static void extract_vert_idx_iter_ledge_mesh(const MeshRenderData *mr, } static void extract_vert_idx_iter_lvert_mesh(const MeshRenderData *mr, - const MVert *UNUSED(mv), + const MVert * /*mv*/, const int lvert_index, void *data) { @@ -182,9 +182,9 @@ static void extract_vert_idx_iter_lvert_mesh(const MeshRenderData *mr, static void extract_vert_idx_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast(buf); const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; @@ -213,7 +213,7 @@ static void extract_vert_idx_init_subdiv(const DRWSubdivCache *subdiv_cache, static void extract_vert_idx_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; if (loose_geom.loop_len == 0) { @@ -254,10 +254,10 @@ static void extract_vert_idx_loose_geom_subdiv(const DRWSubdivCache *subdiv_cach } static void extract_edge_idx_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast(buf); const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; @@ -271,7 +271,7 @@ static void extract_edge_idx_init_subdiv(const DRWSubdivCache *subdiv_cache, static void extract_edge_idx_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; if (loose_geom.edge_len == 0) { @@ -294,9 +294,9 @@ static void extract_edge_idx_loose_geom_subdiv(const DRWSubdivCache *subdiv_cach static void extract_poly_idx_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast(buf); draw_subdiv_init_origindex_buffer( @@ -366,15 +366,15 @@ constexpr MeshExtract create_extractor_vert_idx() } static void extract_fdot_idx_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { extract_select_idx_init_impl(mr, mr->poly_len, buf, tls_data); } -static void extract_fdot_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), - const BMFace *UNUSED(f), +static void extract_fdot_idx_iter_poly_bm(const MeshRenderData * /*mr*/, + const BMFace * /*f*/, const int f_index, void *data) { @@ -382,7 +382,7 @@ static void extract_fdot_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), } static void extract_fdot_idx_iter_poly_mesh(const MeshRenderData *mr, - const MPoly *UNUSED(mp), + const MPoly * /*mp*/, const int mp_index, void *data) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc index f7655658bdd..e8feb4bebce 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc @@ -19,9 +19,9 @@ struct SkinRootData { }; static void extract_skin_roots_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast(buf); /* Exclusively for edit mode. */ diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc index 60ade9daadc..6f0c98c684b 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc @@ -237,7 +237,7 @@ static void extract_tan_ex_init(const MeshRenderData *mr, static void extract_tan_init(const MeshRenderData *mr, MeshBatchCache *cache, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast(buf); extract_tan_ex_init(mr, cache, vbo, false); @@ -256,7 +256,7 @@ static void extract_tan_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { GPUVertCompType comp_type = GPU_COMP_F32; GPUVertFetchMode fetch_mode = GPU_FETCH_FLOAT; @@ -346,7 +346,7 @@ constexpr MeshExtract create_extractor_tan() static void extract_tan_hq_init(const MeshRenderData *mr, MeshBatchCache *cache, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast(buf); extract_tan_ex_init(mr, cache, vbo, true); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc index cbade20dd03..fe6e31af3c2 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc @@ -74,7 +74,7 @@ static bool mesh_extract_uv_format_init(GPUVertFormat *format, static void extract_uv_init(const MeshRenderData *mr, MeshBatchCache *cache, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast(buf); GPUVertFormat format = {0}; @@ -119,10 +119,10 @@ static void extract_uv_init(const MeshRenderData *mr, } static void extract_uv_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { Mesh *coarse_mesh = subdiv_cache->mesh; GPUVertBuf *vbo = static_cast(buffer); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc index 4db5a8c23a4..6ac498eae26 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc @@ -111,9 +111,9 @@ static void extract_weights_init(const MeshRenderData *mr, } } -static void extract_weights_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_weights_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_Weight_Data *data = static_cast(_data); @@ -134,7 +134,7 @@ static void extract_weights_iter_poly_bm(const MeshRenderData *UNUSED(mr), static void extract_weights_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *_data) { MeshExtract_Weight_Data *data = static_cast(_data); diff --git a/source/blender/editors/animation/keyframes_keylist.cc b/source/blender/editors/animation/keyframes_keylist.cc index da266dd4253..9b3cabb6c79 100644 --- a/source/blender/editors/animation/keyframes_keylist.cc +++ b/source/blender/editors/animation/keyframes_keylist.cc @@ -1110,7 +1110,7 @@ void gpencil_to_keylist(bDopeSheet *ads, bGPdata *gpd, AnimKeylist *keylist, con } } -void gpl_to_keylist(bDopeSheet *UNUSED(ads), bGPDlayer *gpl, AnimKeylist *keylist) +void gpl_to_keylist(bDopeSheet * /*ads*/, bGPDlayer *gpl, AnimKeylist *keylist) { if (gpl && keylist) { ED_keylist_reset_last_accessed(keylist); @@ -1124,7 +1124,7 @@ void gpl_to_keylist(bDopeSheet *UNUSED(ads), bGPDlayer *gpl, AnimKeylist *keylis } } -void mask_to_keylist(bDopeSheet *UNUSED(ads), MaskLayer *masklay, AnimKeylist *keylist) +void mask_to_keylist(bDopeSheet * /*ads*/, MaskLayer *masklay, AnimKeylist *keylist) { if (masklay && keylist) { ED_keylist_reset_last_accessed(keylist); diff --git a/source/blender/editors/asset/intern/asset_ops.cc b/source/blender/editors/asset/intern/asset_ops.cc index 5aac4f02b03..08259090e0c 100644 --- a/source/blender/editors/asset/intern/asset_ops.cc +++ b/source/blender/editors/asset/intern/asset_ops.cc @@ -344,8 +344,8 @@ static bool asset_clear_poll(bContext *C) return true; } -static char *asset_clear_get_description(struct bContext *UNUSED(C), - struct wmOperatorType *UNUSED(op), +static char *asset_clear_get_description(struct bContext * /*C*/, + struct wmOperatorType * /*op*/, struct PointerRNA *values) { const bool set_fake_user = RNA_boolean_get(values, "set_fake_user"); @@ -397,7 +397,7 @@ static bool asset_library_refresh_poll(bContext *C) return ED_assetlist_storage_has_list_for_library(library); } -static int asset_library_refresh_exec(bContext *C, wmOperator *UNUSED(unused)) +static int asset_library_refresh_exec(bContext *C, wmOperator * /*unused*/) { /* Execution mode #1: Inside the Asset Browser. */ if (ED_operator_asset_browsing_active(C)) { @@ -773,9 +773,9 @@ static int asset_bundle_install_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static const EnumPropertyItem *rna_asset_library_reference_itemf(bContext *UNUSED(C), - PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), +static const EnumPropertyItem *rna_asset_library_reference_itemf(bContext * /*C*/, + PointerRNA * /*ptr*/, + PropertyRNA * /*prop*/, bool *r_free) { const EnumPropertyItem *items = ED_asset_library_reference_to_rna_enum_itemf(false); diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc index 6750b1a6f1a..38b2b2071b8 100644 --- a/source/blender/editors/curves/intern/curves_ops.cc +++ b/source/blender/editors/curves/intern/curves_ops.cc @@ -467,7 +467,7 @@ static bke::CurvesGeometry particles_to_curves(Object &object, ParticleSystem &p return curves; } -static int curves_convert_from_particle_system_exec(bContext *C, wmOperator *UNUSED(op)) +static int curves_convert_from_particle_system_exec(bContext *C, wmOperator * /*op*/) { Main &bmain = *CTX_data_main(C); Scene &scene = *CTX_data_scene(C); @@ -804,7 +804,7 @@ static void CURVES_OT_set_selection_domain(wmOperatorType *ot) namespace disable_selection { -static int curves_disable_selection_exec(bContext *C, wmOperator *UNUSED(op)) +static int curves_disable_selection_exec(bContext *C, wmOperator * /*op*/) { for (Curves *curves_id : get_unique_editable_curves(*C)) { curves_id->flag &= ~CV_SCULPT_SELECTION_ENABLED; diff --git a/source/blender/editors/geometry/geometry_attributes.cc b/source/blender/editors/geometry/geometry_attributes.cc index 673fb947c57..73b5cab1b25 100644 --- a/source/blender/editors/geometry/geometry_attributes.cc +++ b/source/blender/editors/geometry/geometry_attributes.cc @@ -67,8 +67,8 @@ static bool geometry_attributes_remove_poll(bContext *C) } static const EnumPropertyItem *geometry_attribute_domain_itemf(bContext *C, - PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), + PointerRNA * /*ptr*/, + PropertyRNA * /*prop*/, bool *r_free) { if (C == nullptr) { @@ -352,7 +352,7 @@ static int geometry_attribute_convert_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static void geometry_color_attribute_add_ui(bContext *UNUSED(C), wmOperator *op) +static void geometry_color_attribute_add_ui(bContext * /*C*/, wmOperator *op) { uiLayout *layout = op->layout; uiLayoutSetPropSep(layout, true); @@ -566,7 +566,7 @@ void GEOMETRY_OT_color_attribute_duplicate(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static void geometry_attribute_convert_ui(bContext *UNUSED(C), wmOperator *op) +static void geometry_attribute_convert_ui(bContext * /*C*/, wmOperator *op) { uiLayout *layout = op->layout; uiLayoutSetPropSep(layout, true); @@ -585,7 +585,7 @@ static void geometry_attribute_convert_ui(bContext *UNUSED(C), wmOperator *op) static int geometry_attribute_convert_invoke(bContext *C, wmOperator *op, - const wmEvent *UNUSED(event)) + const wmEvent * /*event*/) { return WM_operator_props_dialog_popup(C, op, 300); } diff --git a/source/blender/editors/gpencil/gpencil_bake_animation.cc b/source/blender/editors/gpencil/gpencil_bake_animation.cc index 38621c50ae8..a163d95f46b 100644 --- a/source/blender/editors/gpencil/gpencil_bake_animation.cc +++ b/source/blender/editors/gpencil/gpencil_bake_animation.cc @@ -65,8 +65,8 @@ const EnumPropertyItem rna_gpencil_reproject_type_items[] = { }; /* Check frame_end is always > start frame! */ -static void gpencil_bake_set_frame_end(struct Main *UNUSED(main), - struct Scene *UNUSED(scene), +static void gpencil_bake_set_frame_end(struct Main * /*main*/, + struct Scene * /*scene*/, struct PointerRNA *ptr) { int frame_start = RNA_int_get(ptr, "frame_start"); @@ -369,7 +369,7 @@ static int gpencil_bake_grease_pencil_animation_exec(bContext *C, wmOperator *op static int gpencil_bake_grease_pencil_animation_invoke(bContext *C, wmOperator *op, - const wmEvent *UNUSED(event)) + const wmEvent * /*event*/) { PropertyRNA *prop; Scene *scene = CTX_data_scene(C); diff --git a/source/blender/editors/gpencil/gpencil_mesh.cc b/source/blender/editors/gpencil/gpencil_mesh.cc index 11d865f814c..50cd74e2b5a 100644 --- a/source/blender/editors/gpencil/gpencil_mesh.cc +++ b/source/blender/editors/gpencil/gpencil_mesh.cc @@ -43,8 +43,8 @@ #include "gpencil_intern.h" /* Check frame_end is always > start frame! */ -static void gpencil_bake_set_frame_end(struct Main *UNUSED(main), - struct Scene *UNUSED(scene), +static void gpencil_bake_set_frame_end(struct Main * /*main*/, + struct Scene * /*scene*/, struct PointerRNA *ptr) { int frame_start = RNA_int_get(ptr, "frame_start"); @@ -380,7 +380,7 @@ static int gpencil_bake_mesh_animation_exec(bContext *C, wmOperator *op) static int gpencil_bake_mesh_animation_invoke(bContext *C, wmOperator *op, - const wmEvent *UNUSED(event)) + const wmEvent * /*event*/) { /* Show popup dialog to allow editing. */ /* FIXME: hard-coded dimensions here are just arbitrary. */ diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index 42b3198a9c0..ec922ea301b 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -82,9 +82,9 @@ static void ui_but_to_pixelrect(struct rcti *rect, const struct ARegion *region, struct uiBlock *block, const struct uiBut *but); -static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *but_p); -static void ui_def_but_rna__panel_type(bContext *UNUSED(C), uiLayout *layout, void *but_p); -static void ui_def_but_rna__menu_type(bContext *UNUSED(C), uiLayout *layout, void *but_p); +static void ui_def_but_rna__menu(bContext * /*C*/, uiLayout *layout, void *but_p); +static void ui_def_but_rna__panel_type(bContext * /*C*/, uiLayout *layout, void *but_p); +static void ui_def_but_rna__menu_type(bContext * /*C*/, uiLayout *layout, void *but_p); /* avoid unneeded calls to ui_but_value_get */ #define UI_BUT_VALUE_UNSET DBL_MAX @@ -4263,7 +4263,7 @@ void ui_def_but_icon_clear(uiBut *but) but->drawflag &= ~UI_BUT_ICON_LEFT; } -static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *but_p) +static void ui_def_but_rna__menu(bContext * /*C*/, uiLayout *layout, void *but_p) { uiBlock *block = uiLayoutGetBlock(layout); uiPopupBlockHandle *handle = block->handle; @@ -6341,7 +6341,7 @@ static void operator_enum_search_update_fn(const struct bContext *C, void *but, const char *str, uiSearchItems *items, - const bool UNUSED(is_first)) + const bool /*is_first*/) { wmOperatorType *ot = ((uiBut *)but)->optype; PropertyRNA *prop = ot->prop; @@ -6390,7 +6390,7 @@ static void operator_enum_search_update_fn(const struct bContext *C, } } -static void operator_enum_search_exec_fn(struct bContext *UNUSED(C), void *but, void *arg2) +static void operator_enum_search_exec_fn(struct bContext * /*C*/, void *but, void *arg2) { wmOperatorType *ot = ((uiBut *)but)->optype; /* Will create it if needed! */ diff --git a/source/blender/editors/interface/interface_anim.cc b/source/blender/editors/interface/interface_anim.cc index 4da6cefd8de..58a7ac93242 100644 --- a/source/blender/editors/interface/interface_anim.cc +++ b/source/blender/editors/interface/interface_anim.cc @@ -315,7 +315,7 @@ void ui_but_anim_paste_driver(bContext *C) WM_operator_name_call(C, "ANIM_OT_paste_driver_button", WM_OP_INVOKE_DEFAULT, nullptr, nullptr); } -void ui_but_anim_decorate_cb(bContext *C, void *arg_but, void *UNUSED(arg_dummy)) +void ui_but_anim_decorate_cb(bContext *C, void *arg_but, void * /*arg_dummy*/) { wmWindowManager *wm = CTX_wm_manager(C); uiButDecorator *but_decorate = static_cast(arg_but); diff --git a/source/blender/editors/interface/interface_dropboxes.cc b/source/blender/editors/interface/interface_dropboxes.cc index 378162a120e..ebfde05f516 100644 --- a/source/blender/editors/interface/interface_dropboxes.cc +++ b/source/blender/editors/interface/interface_dropboxes.cc @@ -41,10 +41,7 @@ static bool ui_view_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event) return UI_view_item_can_drop(hovered_item, drag, &drag->drop_state.disabled_info); } -static char *ui_view_drop_tooltip(bContext *C, - wmDrag *drag, - const int xy[2], - wmDropBox *UNUSED(drop)) +static char *ui_view_drop_tooltip(bContext *C, wmDrag *drag, const int xy[2], wmDropBox * /*drop*/) { const ARegion *region = CTX_wm_region(C); const uiViewItemHandle *hovered_item = UI_region_views_find_item_at(region, xy); @@ -61,12 +58,12 @@ static char *ui_view_drop_tooltip(bContext *C, /** \name Name Drag/Drop Callbacks * \{ */ -static bool ui_drop_name_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED(event)) +static bool ui_drop_name_poll(struct bContext *C, wmDrag *drag, const wmEvent * /*event*/) { return UI_but_active_drop_name(C) && (drag->type == WM_DRAG_ID); } -static void ui_drop_name_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void ui_drop_name_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { const ID *id = WM_drag_get_local_ID(drag, 0); RNA_string_set(drop->ptr, "string", id->name + 2); @@ -78,13 +75,13 @@ static void ui_drop_name_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop /** \name Material Drag/Drop Callbacks * \{ */ -static bool ui_drop_material_poll(bContext *C, wmDrag *drag, const wmEvent *UNUSED(event)) +static bool ui_drop_material_poll(bContext *C, wmDrag *drag, const wmEvent * /*event*/) { PointerRNA mat_slot = CTX_data_pointer_get_type(C, "material_slot", &RNA_MaterialSlot); return WM_drag_is_ID_type(drag, ID_MA) && !RNA_pointer_is_null(&mat_slot); } -static void ui_drop_material_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void ui_drop_material_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { const ID *id = WM_drag_get_local_ID_or_import_from_asset(drag, ID_MA); RNA_int_set(drop->ptr, "session_uuid", int(id->session_uuid)); @@ -93,7 +90,7 @@ static void ui_drop_material_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox * static char *ui_drop_material_tooltip(bContext *C, wmDrag *drag, const int UNUSED(xy[2]), - struct wmDropBox *UNUSED(drop)) + struct wmDropBox * /*drop*/) { PointerRNA rna_ptr = CTX_data_pointer_get_type(C, "object", &RNA_Object); Object *ob = (Object *)rna_ptr.data; diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index 603b2c96713..6815f8689f5 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -270,7 +270,7 @@ static bool copy_python_command_button_poll(bContext *C) return false; } -static int copy_python_command_button_exec(bContext *C, wmOperator *UNUSED(op)) +static int copy_python_command_button_exec(bContext *C, wmOperator * /*op*/) { uiBut *but = UI_context_active_but_get(C); @@ -421,7 +421,7 @@ static bool assign_default_button_poll(bContext *C) return false; } -static int assign_default_button_exec(bContext *C, wmOperator *UNUSED(op)) +static int assign_default_button_exec(bContext *C, wmOperator * /*op*/) { PointerRNA ptr; PropertyRNA *prop; @@ -461,7 +461,7 @@ static void UI_OT_assign_default_button(wmOperatorType *ot) /** \name Unset Property Button Operator * \{ */ -static int unset_property_button_exec(bContext *C, wmOperator *UNUSED(op)) +static int unset_property_button_exec(bContext *C, wmOperator * /*op*/) { PointerRNA ptr; PropertyRNA *prop; @@ -609,9 +609,7 @@ static int override_type_set_button_exec(bContext *C, wmOperator *op) return operator_button_property_finish(C, &ptr, prop); } -static int override_type_set_button_invoke(bContext *C, - wmOperator *op, - const wmEvent *UNUSED(event)) +static int override_type_set_button_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { #if 0 /* Disabled for now */ return WM_menu_invoke_ex(C, op, WM_OP_INVOKE_DEFAULT); @@ -806,7 +804,7 @@ static bool override_idtemplate_make_poll(bContext *C) return override_idtemplate_poll(C, true); } -static int override_idtemplate_make_exec(bContext *C, wmOperator *UNUSED(op)) +static int override_idtemplate_make_exec(bContext *C, wmOperator * /*op*/) { ID *owner_id, *id; PointerRNA owner_ptr; @@ -869,7 +867,7 @@ static bool override_idtemplate_reset_poll(bContext *C) return override_idtemplate_poll(C, false); } -static int override_idtemplate_reset_exec(bContext *C, wmOperator *UNUSED(op)) +static int override_idtemplate_reset_exec(bContext *C, wmOperator * /*op*/) { ID *owner_id, *id; PointerRNA owner_ptr; @@ -917,7 +915,7 @@ static bool override_idtemplate_clear_poll(bContext *C) return override_idtemplate_poll(C, false); } -static int override_idtemplate_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int override_idtemplate_clear_exec(bContext *C, wmOperator * /*op*/) { ID *owner_id, *id; PointerRNA owner_ptr; @@ -992,7 +990,7 @@ static void UI_OT_override_idtemplate_clear(wmOperatorType *ot) ot->flag = OPTYPE_UNDO; } -static bool override_idtemplate_menu_poll(const bContext *C_const, MenuType *UNUSED(mt)) +static bool override_idtemplate_menu_poll(const bContext *C_const, MenuType * /*mt*/) { bContext *C = (bContext *)C_const; ID *owner_id, *id; @@ -1008,7 +1006,7 @@ static bool override_idtemplate_menu_poll(const bContext *C_const, MenuType *UNU return true; } -static void override_idtemplate_menu_draw(const bContext *UNUSED(C), Menu *menu) +static void override_idtemplate_menu_draw(const bContext * /*C*/, Menu *menu) { uiLayout *layout = menu->layout; uiItemO(layout, IFACE_("Make"), ICON_NONE, "UI_OT_override_idtemplate_make"); @@ -1604,7 +1602,7 @@ bool ui_jump_to_target_button_poll(bContext *C) return jump_to_target_button(C, true); } -static int jump_to_target_button_exec(bContext *C, wmOperator *UNUSED(op)) +static int jump_to_target_button_exec(bContext *C, wmOperator * /*op*/) { const bool success = jump_to_target_button(C, false); @@ -2033,7 +2031,7 @@ static void UI_OT_edittranslation_init(wmOperatorType *ot) /** \name Reload Translation Operator * \{ */ -static int reloadtranslation_exec(bContext *UNUSED(C), wmOperator *UNUSED(op)) +static int reloadtranslation_exec(bContext * /*C*/, wmOperator * /*op*/) { BLT_lang_init(); BLF_cache_clear(); @@ -2116,7 +2114,7 @@ static void UI_OT_button_execute(wmOperatorType *ot) /** \name Text Button Clear Operator * \{ */ -static int button_string_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int button_string_clear_exec(bContext *C, wmOperator * /*op*/) { uiBut *but = UI_context_active_but_get_respect_menu(C); @@ -2144,7 +2142,7 @@ static void UI_OT_button_string_clear(wmOperatorType *ot) /** \name Drop Color Operator * \{ */ -bool UI_drop_color_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED(event)) +bool UI_drop_color_poll(struct bContext *C, wmDrag *drag, const wmEvent * /*event*/) { /* should only return true for regions that include buttons, for now * return true always */ @@ -2165,7 +2163,7 @@ bool UI_drop_color_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED( return false; } -void UI_drop_color_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +void UI_drop_color_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { uiDragColorHandle *drag_info = static_cast(drag->poin); @@ -2263,7 +2261,7 @@ static bool drop_name_poll(bContext *C) return true; } -static int drop_name_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int drop_name_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { uiBut *but = UI_but_active_drop_name_button(C); char *str = RNA_string_get_alloc(op->ptr, "string", nullptr, 0, nullptr); @@ -2323,7 +2321,7 @@ static bool ui_list_unhide_filter_options(uiList *list) return true; } -static int ui_list_start_filter_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int ui_list_start_filter_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { ARegion *region = CTX_wm_region(C); uiList *list = UI_list_find_mouse_over(region, event); @@ -2369,7 +2367,7 @@ static bool ui_view_drop_poll(bContext *C) return hovered_item != nullptr; } -static int ui_view_drop_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int ui_view_drop_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { if (event->custom != EVT_DATA_DRAGDROP) { return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH; @@ -2419,7 +2417,7 @@ static bool ui_view_item_rename_poll(bContext *C) return active_item != nullptr && UI_view_item_can_rename(active_item); } -static int ui_view_item_rename_exec(bContext *C, wmOperator *UNUSED(op)) +static int ui_view_item_rename_exec(bContext *C, wmOperator * /*op*/) { ARegion *region = CTX_wm_region(C); uiViewItemHandle *active_item = UI_region_views_find_active_item(region); diff --git a/source/blender/editors/interface/interface_panel.cc b/source/blender/editors/interface/interface_panel.cc index d25302616e5..7a69e2f9b2f 100644 --- a/source/blender/editors/interface/interface_panel.cc +++ b/source/blender/editors/interface/interface_panel.cc @@ -1804,7 +1804,7 @@ static void panels_layout_begin_clear_flags(ListBase *lb) } } -void UI_panels_begin(const bContext *UNUSED(C), ARegion *region) +void UI_panels_begin(const bContext * /*C*/, ARegion *region) { /* Set all panels as inactive, so that at the end we know which ones were used. Also * clear other flags so we know later that their values were set for the current redraw. */ @@ -1924,7 +1924,7 @@ struct uiPanelDragCollapseHandle { int xy_init[2]; }; -static void ui_panel_drag_collapse_handler_remove(bContext *UNUSED(C), void *userdata) +static void ui_panel_drag_collapse_handler_remove(bContext * /*C*/, void *userdata) { uiPanelDragCollapseHandle *dragcol_data = static_cast(userdata); MEM_freeN(dragcol_data); diff --git a/source/blender/editors/interface/interface_query.cc b/source/blender/editors/interface/interface_query.cc index 8a940ce14ee..480c3e00e6e 100644 --- a/source/blender/editors/interface/interface_query.cc +++ b/source/blender/editors/interface/interface_query.cc @@ -424,7 +424,7 @@ uiBut *ui_list_find_from_row(const ARegion *region, const uiBut *row_but) return ui_but_find(region, ui_but_is_listbox_with_row, row_but); } -static bool ui_but_is_listrow(const uiBut *but, const void *UNUSED(customdata)) +static bool ui_but_is_listrow(const uiBut *but, const void * /*customdata*/) { return but->type == UI_BTYPE_LISTROW; } @@ -456,7 +456,7 @@ uiBut *ui_list_row_find_from_index(const ARegion *region, const int index, uiBut return ui_but_find(region, ui_but_is_listrow_at_index, &data); } -static bool ui_but_is_view_item_fn(const uiBut *but, const void *UNUSED(customdata)) +static bool ui_but_is_view_item_fn(const uiBut *but, const void * /*customdata*/) { return but->type == UI_BTYPE_VIEW_ITEM; } @@ -466,7 +466,7 @@ uiBut *ui_view_item_find_mouse_over(const ARegion *region, const int xy[2]) return ui_but_find_mouse_over_ex(region, xy, false, false, ui_but_is_view_item_fn, nullptr); } -static bool ui_but_is_active_view_item(const uiBut *but, const void *UNUSED(customdata)) +static bool ui_but_is_active_view_item(const uiBut *but, const void * /*customdata*/) { if (but->type != UI_BTYPE_VIEW_ITEM) { return false; diff --git a/source/blender/editors/interface/interface_region_color_picker.cc b/source/blender/editors/interface/interface_region_color_picker.cc index b49888005fa..0b2c538331a 100644 --- a/source/blender/editors/interface/interface_region_color_picker.cc +++ b/source/blender/editors/interface/interface_region_color_picker.cc @@ -245,7 +245,7 @@ static void ui_update_color_picker_buts_rgb(uiBut *from_but, } } -static void ui_colorpicker_rgba_update_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg)) +static void ui_colorpicker_rgba_update_cb(bContext * /*C*/, void *bt1, void * /*arg*/) { uiBut *but = (uiBut *)bt1; uiPopupBlockHandle *popup = but->block->handle; @@ -264,7 +264,7 @@ static void ui_colorpicker_rgba_update_cb(bContext *UNUSED(C), void *bt1, void * } } -static void ui_colorpicker_hsv_update_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg)) +static void ui_colorpicker_hsv_update_cb(bContext * /*C*/, void *bt1, void * /*arg*/) { uiBut *but = (uiBut *)bt1; uiPopupBlockHandle *popup = but->block->handle; @@ -279,7 +279,7 @@ static void ui_colorpicker_hsv_update_cb(bContext *UNUSED(C), void *bt1, void *U } } -static void ui_colorpicker_hex_rna_cb(bContext *UNUSED(C), void *bt1, void *hexcl) +static void ui_colorpicker_hex_rna_cb(bContext * /*C*/, void *bt1, void *hexcl) { uiBut *but = (uiBut *)bt1; uiPopupBlockHandle *popup = but->block->handle; @@ -302,7 +302,7 @@ static void ui_colorpicker_hex_rna_cb(bContext *UNUSED(C), void *bt1, void *hexc } } -static void ui_popup_close_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg)) +static void ui_popup_close_cb(bContext * /*C*/, void *bt1, void * /*arg*/) { uiBut *but = (uiBut *)bt1; uiPopupBlockHandle *popup = but->block->handle; @@ -336,7 +336,7 @@ static void ui_colorpicker_hide_reveal(uiBlock *block, ePickerType colormode) } } -static void ui_colorpicker_create_mode_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg)) +static void ui_colorpicker_create_mode_cb(bContext * /*C*/, void *bt1, void * /*arg*/) { uiBut *bt = static_cast(bt1); const short colormode = ui_but_value_get(bt); @@ -820,7 +820,7 @@ static void ui_block_colorpicker(uiBlock *block, ui_colorpicker_hide_reveal(block, (ePickerType)colormode); } -static int ui_colorpicker_small_wheel_cb(const bContext *UNUSED(C), +static int ui_colorpicker_small_wheel_cb(const bContext * /*C*/, uiBlock *block, const wmEvent *event) { diff --git a/source/blender/editors/interface/interface_region_hud.cc b/source/blender/editors/interface/interface_region_hud.cc index aca36686dea..9c13a776db0 100644 --- a/source/blender/editors/interface/interface_region_hud.cc +++ b/source/blender/editors/interface/interface_region_hud.cc @@ -87,7 +87,7 @@ static void hud_region_hide(ARegion *region) /** \name Redo Panel * \{ */ -static bool hud_panel_operator_redo_poll(const bContext *C, PanelType *UNUSED(pt)) +static bool hud_panel_operator_redo_poll(const bContext *C, PanelType * /*pt*/) { ScrArea *area = CTX_wm_area(C); ARegion *region = BKE_area_find_region_type(area, RGN_TYPE_HUD); diff --git a/source/blender/editors/interface/interface_region_menu_pie.cc b/source/blender/editors/interface/interface_region_menu_pie.cc index becdfaf4e25..9dd6f95e190 100644 --- a/source/blender/editors/interface/interface_region_menu_pie.cc +++ b/source/blender/editors/interface/interface_region_menu_pie.cc @@ -49,7 +49,7 @@ struct uiPieMenu { int mx, my; }; -static uiBlock *ui_block_func_PIE(bContext *UNUSED(C), uiPopupBlockHandle *handle, void *arg_pie) +static uiBlock *ui_block_func_PIE(bContext * /*C*/, uiPopupBlockHandle *handle, void *arg_pie) { uiBlock *block; uiPieMenu *pie = static_cast(arg_pie); diff --git a/source/blender/editors/interface/interface_region_popover.cc b/source/blender/editors/interface/interface_region_popover.cc index e3bb4056608..431571c1376 100644 --- a/source/blender/editors/interface/interface_region_popover.cc +++ b/source/blender/editors/interface/interface_region_popover.cc @@ -355,7 +355,7 @@ uiPopover *UI_popover_begin(bContext *C, int ui_menu_width, bool from_active_but return pup; } -static void popover_keymap_fn(wmKeyMap *UNUSED(keymap), wmKeyMapItem *UNUSED(kmi), void *user_data) +static void popover_keymap_fn(wmKeyMap * /*keymap*/, wmKeyMapItem * /*kmi*/, void *user_data) { uiPopover *pup = static_cast(user_data); pup->block->handle->menuretval = UI_RETURN_OK; diff --git a/source/blender/editors/interface/interface_region_search.cc b/source/blender/editors/interface/interface_region_search.cc index fdef2c15d82..8def878c6af 100644 --- a/source/blender/editors/interface/interface_region_search.cc +++ b/source/blender/editors/interface/interface_region_search.cc @@ -307,8 +307,8 @@ bool ui_searchbox_apply(uiBut *but, ARegion *region) static struct ARegion *wm_searchbox_tooltip_init(struct bContext *C, struct ARegion *region, - int *UNUSED(r_pass), - double *UNUSED(pass_delay), + int * /*r_pass*/, + double * /*pass_delay*/, bool *r_exit_on_event) { *r_exit_on_event = true; @@ -903,7 +903,7 @@ static void str_tolower_titlecaps_ascii(char *str, const size_t len) } } -static void ui_searchbox_region_draw_cb__operator(const bContext *UNUSED(C), ARegion *region) +static void ui_searchbox_region_draw_cb__operator(const bContext * /*C*/, ARegion *region) { uiSearchboxData *data = static_cast(region->regiondata); @@ -997,7 +997,7 @@ void ui_searchbox_free(bContext *C, ARegion *region) ui_region_temp_remove(C, CTX_wm_screen(C), region); } -static void ui_searchbox_region_draw_cb__menu(const bContext *UNUSED(C), ARegion *UNUSED(region)) +static void ui_searchbox_region_draw_cb__menu(const bContext * /*C*/, ARegion * /*region*/) { /* Currently unused. */ } diff --git a/source/blender/editors/interface/interface_region_tooltip.cc b/source/blender/editors/interface/interface_region_tooltip.cc index 3ded613c6f3..2a06267d90b 100644 --- a/source/blender/editors/interface/interface_region_tooltip.cc +++ b/source/blender/editors/interface/interface_region_tooltip.cc @@ -157,7 +157,7 @@ static void rgb_tint(float col[3], float h, float h_strength, float v, float v_s hsv_to_rgb_v(col_hsv_to, col); } -static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *region) +static void ui_tooltip_region_draw_cb(const bContext * /*C*/, ARegion *region) { const float pad_px = UI_TIP_PADDING; uiTooltipData *data = static_cast(region->regiondata); diff --git a/source/blender/editors/interface/interface_template_asset_view.cc b/source/blender/editors/interface/interface_template_asset_view.cc index 3147deb5ad1..11fe653724c 100644 --- a/source/blender/editors/interface/interface_template_asset_view.cc +++ b/source/blender/editors/interface/interface_template_asset_view.cc @@ -66,15 +66,15 @@ static void asset_view_item_but_drag_set(uiBut *but, } static void asset_view_draw_item(uiList *ui_list, - const bContext *UNUSED(C), + const bContext * /*C*/, uiLayout *layout, - PointerRNA *UNUSED(dataptr), + PointerRNA * /*dataptr*/, PointerRNA *itemptr, - int UNUSED(icon), - PointerRNA *UNUSED(active_dataptr), - const char *UNUSED(active_propname), - int UNUSED(index), - int UNUSED(flt_flag)) + int /*icon*/, + PointerRNA * /*active_dataptr*/, + const char * /*active_propname*/, + int /*index*/, + int /*flt_flag*/) { AssetViewListData *list_data = (AssetViewListData *)ui_list->dyn_data->customdata; diff --git a/source/blender/editors/interface/interface_template_list.cc b/source/blender/editors/interface/interface_template_list.cc index f09eb5f3eb0..2b581f187a6 100644 --- a/source/blender/editors/interface/interface_template_list.cc +++ b/source/blender/editors/interface/interface_template_list.cc @@ -83,15 +83,15 @@ struct TemplateListVisualInfo { }; static void uilist_draw_item_default(struct uiList *ui_list, - const struct bContext *UNUSED(C), + const struct bContext * /*C*/, struct uiLayout *layout, - struct PointerRNA *UNUSED(dataptr), + struct PointerRNA * /*dataptr*/, struct PointerRNA *itemptr, int icon, - struct PointerRNA *UNUSED(active_dataptr), - const char *UNUSED(active_propname), - int UNUSED(index), - int UNUSED(flt_flag)) + struct PointerRNA * /*active_dataptr*/, + const char * /*active_propname*/, + int /*index*/, + int /*flt_flag*/) { PropertyRNA *nameprop = RNA_struct_name_property(itemptr->type); @@ -114,7 +114,7 @@ static void uilist_draw_item_default(struct uiList *ui_list, } static void uilist_draw_filter_default(struct uiList *ui_list, - const struct bContext *UNUSED(C), + const struct bContext * /*C*/, struct uiLayout *layout) { PointerRNA listptr; @@ -160,7 +160,7 @@ static int cmpstringp(const void *p1, const void *p2) } static void uilist_filter_items_default(struct uiList *ui_list, - const struct bContext *UNUSED(C), + const struct bContext * /*C*/, struct PointerRNA *dataptr, const char *propname) { @@ -561,7 +561,7 @@ static void uilist_prepare(uiList *ui_list, items->tot_items); } -static void uilist_resize_update_cb(bContext *C, void *arg1, void *UNUSED(arg2)) +static void uilist_resize_update_cb(bContext *C, void *arg1, void * /*arg2*/) { uiList *ui_list = static_cast(arg1); uiListDyn *dyn_data = ui_list->dyn_data; @@ -592,7 +592,7 @@ static void *uilist_item_use_dynamic_tooltip(PointerRNA *itemptr, const char *pr return nullptr; } -static char *uilist_item_tooltip_func(bContext *UNUSED(C), void *argN, const char *tip) +static char *uilist_item_tooltip_func(bContext * /*C*/, void *argN, const char *tip) { char *dyn_tooltip = static_cast(argN); return BLI_sprintfN("%s - %s", tip, dyn_tooltip); diff --git a/source/blender/editors/interface/interface_template_search_menu.cc b/source/blender/editors/interface/interface_template_search_menu.cc index f61baf65b58..515a69c19c9 100644 --- a/source/blender/editors/interface/interface_template_search_menu.cc +++ b/source/blender/editors/interface/interface_template_search_menu.cc @@ -931,7 +931,7 @@ static void menu_search_arg_free_fn(void *data_v) MEM_freeN(data); } -static void menu_search_exec_fn(bContext *C, void *UNUSED(arg1), void *arg2) +static void menu_search_exec_fn(bContext *C, void * /*arg1*/, void *arg2) { MenuSearch_Item *item = (MenuSearch_Item *)arg2; if (item == nullptr) { @@ -994,11 +994,11 @@ static void menu_search_exec_fn(bContext *C, void *UNUSED(arg1), void *arg2) } } -static void menu_search_update_fn(const bContext *UNUSED(C), +static void menu_search_update_fn(const bContext * /*C*/, void *arg, const char *str, uiSearchItems *items, - const bool UNUSED(is_first)) + const bool /*is_first*/) { MenuSearch_Data *data = (MenuSearch_Data *)arg; @@ -1077,7 +1077,7 @@ static bool ui_search_menu_create_context_menu(struct bContext *C, static struct ARegion *ui_search_menu_create_tooltip(struct bContext *C, struct ARegion *region, - const rcti *UNUSED(item_rect), + const rcti * /*item_rect*/, void *arg, void *active) { diff --git a/source/blender/editors/interface/interface_template_search_operator.cc b/source/blender/editors/interface/interface_template_search_operator.cc index 0d0a5f01744..58f44de5278 100644 --- a/source/blender/editors/interface/interface_template_search_operator.cc +++ b/source/blender/editors/interface/interface_template_search_operator.cc @@ -34,7 +34,7 @@ /** \name Operator Search Template Implementation * \{ */ -static void operator_search_exec_fn(bContext *C, void *UNUSED(arg1), void *arg2) +static void operator_search_exec_fn(bContext *C, void * /*arg1*/, void *arg2) { wmOperatorType *ot = static_cast(arg2); @@ -44,10 +44,10 @@ static void operator_search_exec_fn(bContext *C, void *UNUSED(arg1), void *arg2) } static void operator_search_update_fn(const bContext *C, - void *UNUSED(arg), + void * /*arg*/, const char *str, uiSearchItems *items, - const bool UNUSED(is_first)) + const bool /*is_first*/) { GHashIterator iter; diff --git a/source/blender/editors/interface/view2d_draw.cc b/source/blender/editors/interface/view2d_draw.cc index ca96c2abb9d..a8d6d6c78de 100644 --- a/source/blender/editors/interface/view2d_draw.cc +++ b/source/blender/editors/interface/view2d_draw.cc @@ -408,7 +408,7 @@ static void draw_vertical_scale_indicators(const ARegion *region, } static void view_to_string__frame_number( - void *UNUSED(user_data), float v2d_pos, float UNUSED(v2d_step), uint max_len, char *r_str) + void * /*user_data*/, float v2d_pos, float /*v2d_step*/, uint max_len, char *r_str) { BLI_snprintf(r_str, max_len, "%d", int(v2d_pos)); } @@ -428,7 +428,7 @@ static void view_to_string__time( } static void view_to_string__value( - void *UNUSED(user_data), float v2d_pos, float v2d_step, uint max_len, char *r_str) + void * /*user_data*/, float v2d_pos, float v2d_step, uint max_len, char *r_str) { if (v2d_step >= 1.0f) { BLI_snprintf(r_str, max_len, "%d", int(v2d_pos)); diff --git a/source/blender/editors/interface/view2d_gizmo_navigate.cc b/source/blender/editors/interface/view2d_gizmo_navigate.cc index fae28833e4f..78549a33fc5 100644 --- a/source/blender/editors/interface/view2d_gizmo_navigate.cc +++ b/source/blender/editors/interface/view2d_gizmo_navigate.cc @@ -113,7 +113,7 @@ struct NavigateWidgetGroup { int region_size[2]; }; -static bool WIDGETGROUP_navigate_poll(const bContext *C, wmGizmoGroupType *UNUSED(gzgt)) +static bool WIDGETGROUP_navigate_poll(const bContext *C, wmGizmoGroupType * /*gzgt*/) { if ((U.uiflag & USER_SHOW_GIZMO_NAVIGATE) == 0) { return false; @@ -141,7 +141,7 @@ static bool WIDGETGROUP_navigate_poll(const bContext *C, wmGizmoGroupType *UNUSE return true; } -static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup) +static void WIDGETGROUP_navigate_setup(const bContext * /*C*/, wmGizmoGroup *gzgroup) { NavigateWidgetGroup *navgroup = MEM_cnew(__func__); diff --git a/source/blender/editors/interface/view2d_ops.cc b/source/blender/editors/interface/view2d_ops.cc index c72a0c75ee4..9b2c17bd73e 100644 --- a/source/blender/editors/interface/view2d_ops.cc +++ b/source/blender/editors/interface/view2d_ops.cc @@ -293,7 +293,7 @@ static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -static void view_pan_cancel(bContext *UNUSED(C), wmOperator *op) +static void view_pan_cancel(bContext * /*C*/, wmOperator *op) { view_pan_exit(op); } @@ -330,7 +330,7 @@ static void VIEW2D_OT_pan(wmOperatorType *ot) * \{ */ /* set up modal operator and relevant settings */ -static int view_edge_pan_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int view_edge_pan_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { op->customdata = MEM_callocN(sizeof(View2DEdgePanData), "View2DEdgePanData"); View2DEdgePanData *vpd = static_cast(op->customdata); @@ -358,7 +358,7 @@ static int view_edge_pan_modal(bContext *C, wmOperator *op, const wmEvent *event return OPERATOR_PASS_THROUGH; } -static void view_edge_pan_cancel(bContext *UNUSED(C), wmOperator *op) +static void view_edge_pan_cancel(bContext * /*C*/, wmOperator *op) { v2dViewPanData *vpd = static_cast(op->customdata); vpd->v2d->flag &= ~V2D_IS_NAVIGATING; @@ -1614,7 +1614,7 @@ void UI_view2d_smooth_view(const bContext *C, } /* only meant for timer usage */ -static int view2d_smoothview_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int view2d_smoothview_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { wmWindow *win = CTX_wm_window(C); ARegion *region = CTX_wm_region(C); @@ -2169,7 +2169,7 @@ static void VIEW2D_OT_scroller_activate(wmOperatorType *ot) /** \name View Reset Operator * \{ */ -static int reset_exec(bContext *C, wmOperator *UNUSED(op)) +static int reset_exec(bContext *C, wmOperator * /*op*/) { const uiStyle *style = UI_style_get(); ARegion *region = CTX_wm_region(C); diff --git a/source/blender/editors/interface/views/abstract_view_item.cc b/source/blender/editors/interface/views/abstract_view_item.cc index f73183d07e9..101cb66bfa9 100644 --- a/source/blender/editors/interface/views/abstract_view_item.cc +++ b/source/blender/editors/interface/views/abstract_view_item.cc @@ -112,7 +112,7 @@ static AbstractViewItem *find_item_from_rename_button(const uiBut &rename_but) return nullptr; } -static void rename_button_fn(bContext *UNUSED(C), void *arg, char *UNUSED(origstr)) +static void rename_button_fn(bContext * /*C*/, void *arg, char * /*origstr*/) { const uiBut *rename_but = static_cast(arg); AbstractViewItem *item = find_item_from_rename_button(*rename_but); diff --git a/source/blender/editors/mesh/editmesh_select.cc b/source/blender/editors/mesh/editmesh_select.cc index 675540bea73..86e104359f3 100644 --- a/source/blender/editors/mesh/editmesh_select.cc +++ b/source/blender/editors/mesh/editmesh_select.cc @@ -373,7 +373,7 @@ static void find_nearest_edge_center__doZBuf(void *userData, BMEdge *eed, const float screen_co_a[2], const float screen_co_b[2], - int UNUSED(index)) + int /*index*/) { NearestEdgeUserData_ZBuf *data = static_cast(userData); @@ -628,7 +628,7 @@ struct NearestFaceUserData_ZBuf { static void find_nearest_face_center__doZBuf(void *userData, BMFace *efa, const float screen_co[2], - int UNUSED(index)) + int /*index*/) { NearestFaceUserData_ZBuf *data = static_cast(userData); @@ -1378,8 +1378,8 @@ static int edbm_select_mode_invoke(bContext *C, wmOperator *op, const wmEvent *e return edbm_select_mode_exec(C, op); } -static char *edbm_select_mode_get_description(bContext *UNUSED(C), - wmOperatorType *UNUSED(op), +static char *edbm_select_mode_get_description(bContext * /*C*/, + wmOperatorType * /*op*/, PointerRNA *values) { const int type = RNA_enum_get(values, "type"); @@ -1976,7 +1976,7 @@ void MESH_OT_select_all(wmOperatorType *ot) /** \name Select Interior Faces Operator * \{ */ -static int edbm_faces_select_interior_exec(bContext *C, wmOperator *UNUSED(op)) +static int edbm_faces_select_interior_exec(bContext *C, wmOperator * /*op*/) { const Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -2797,7 +2797,7 @@ struct BMFaceLink { float area; }; -static bool bm_interior_loop_filter_fn(const BMLoop *l, void *UNUSED(user_data)) +static bool bm_interior_loop_filter_fn(const BMLoop *l, void * /*user_data*/) { if (BM_elem_flag_test(l->e, BM_ELEM_TAG)) { return false; @@ -5054,7 +5054,7 @@ void MESH_OT_select_axis(wmOperatorType *ot) /** \name Select Region to Loop Operator * \{ */ -static int edbm_region_to_loop_exec(bContext *C, wmOperator *UNUSED(op)) +static int edbm_region_to_loop_exec(bContext *C, wmOperator * /*op*/) { const Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc index ea03117a525..9dec3583763 100644 --- a/source/blender/editors/mesh/mesh_data.cc +++ b/source/blender/editors/mesh/mesh_data.cc @@ -378,7 +378,7 @@ int ED_mesh_color_add(Mesh *me, const char *name, const bool active_set, const bool do_init, - ReportList *UNUSED(reports)) + ReportList * /*reports*/) { /* NOTE: keep in sync with #ED_mesh_uv_add. */ @@ -464,7 +464,7 @@ static bool layers_poll(bContext *C) int ED_mesh_sculpt_color_add(Mesh *me, const char *name, const bool do_init, - ReportList *UNUSED(reports)) + ReportList * /*reports*/) { /* NOTE: keep in sync with #ED_mesh_uv_add. */ @@ -566,7 +566,7 @@ void MESH_OT_uv_texture_add(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static int mesh_uv_texture_remove_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_uv_texture_remove_exec(bContext *C, wmOperator * /*op*/) { Object *ob = ED_object_context(C); Mesh *me = static_cast(ob->data); @@ -673,7 +673,7 @@ static bool mesh_customdata_mask_clear_poll(bContext *C) } return false; } -static int mesh_customdata_mask_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_mask_clear_exec(bContext *C, wmOperator * /*op*/) { int ret_a = mesh_customdata_clear_exec__internal(C, BM_VERT, CD_PAINT_MASK); int ret_b = mesh_customdata_clear_exec__internal(C, BM_LOOP, CD_GRID_PAINT_MASK); @@ -724,7 +724,7 @@ static bool mesh_customdata_skin_add_poll(bContext *C) return (mesh_customdata_skin_state(C) == 0); } -static int mesh_customdata_skin_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_skin_add_exec(bContext *C, wmOperator * /*op*/) { Object *ob = ED_object_context(C); Mesh *me = static_cast(ob->data); @@ -757,7 +757,7 @@ static bool mesh_customdata_skin_clear_poll(bContext *C) return (mesh_customdata_skin_state(C) == 1); } -static int mesh_customdata_skin_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_skin_clear_exec(bContext *C, wmOperator * /*op*/) { return mesh_customdata_clear_exec__internal(C, BM_VERT, CD_MVERT_SKIN); } @@ -778,7 +778,7 @@ void MESH_OT_customdata_skin_clear(wmOperatorType *ot) } /* Clear custom loop normals */ -static int mesh_customdata_custom_splitnormals_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_custom_splitnormals_add_exec(bContext *C, wmOperator * /*op*/) { Mesh *me = ED_mesh_context(C); @@ -841,7 +841,7 @@ void MESH_OT_customdata_custom_splitnormals_add(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static int mesh_customdata_custom_splitnormals_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_custom_splitnormals_clear_exec(bContext *C, wmOperator * /*op*/) { Mesh *me = ED_mesh_context(C); @@ -891,7 +891,7 @@ static bool mesh_customdata_bevel_weight_vertex_add_poll(bContext *C) return mesh_customdata_bevel_weight_vertex_state(C) == 0; } -static int mesh_customdata_bevel_weight_vertex_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_bevel_weight_vertex_add_exec(bContext *C, wmOperator * /*op*/) { return mesh_customdata_add_exec__internal(C, BM_VERT, CD_BWEIGHT); } @@ -913,7 +913,7 @@ static bool mesh_customdata_bevel_weight_vertex_clear_poll(bContext *C) return (mesh_customdata_bevel_weight_vertex_state(C) == 1); } -static int mesh_customdata_bevel_weight_vertex_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_bevel_weight_vertex_clear_exec(bContext *C, wmOperator * /*op*/) { return mesh_customdata_clear_exec__internal(C, BM_VERT, CD_BWEIGHT); } @@ -951,7 +951,7 @@ static bool mesh_customdata_bevel_weight_edge_add_poll(bContext *C) return mesh_customdata_bevel_weight_edge_state(C) == 0; } -static int mesh_customdata_bevel_weight_edge_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_bevel_weight_edge_add_exec(bContext *C, wmOperator * /*op*/) { return mesh_customdata_add_exec__internal(C, BM_EDGE, CD_BWEIGHT); } @@ -973,7 +973,7 @@ static bool mesh_customdata_bevel_weight_edge_clear_poll(bContext *C) return mesh_customdata_bevel_weight_edge_state(C) == 1; } -static int mesh_customdata_bevel_weight_edge_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_bevel_weight_edge_clear_exec(bContext *C, wmOperator * /*op*/) { return mesh_customdata_clear_exec__internal(C, BM_EDGE, CD_BWEIGHT); } @@ -1011,7 +1011,7 @@ static bool mesh_customdata_crease_edge_add_poll(bContext *C) return mesh_customdata_crease_edge_state(C) == 0; } -static int mesh_customdata_crease_edge_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_crease_edge_add_exec(bContext *C, wmOperator * /*op*/) { return mesh_customdata_add_exec__internal(C, BM_EDGE, CD_CREASE); } @@ -1033,7 +1033,7 @@ static bool mesh_customdata_crease_edge_clear_poll(bContext *C) return mesh_customdata_crease_edge_state(C) == 1; } -static int mesh_customdata_crease_edge_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_crease_edge_clear_exec(bContext *C, wmOperator * /*op*/) { return mesh_customdata_clear_exec__internal(C, BM_EDGE, CD_CREASE); } @@ -1071,7 +1071,7 @@ static bool mesh_customdata_crease_vertex_add_poll(bContext *C) return mesh_customdata_crease_vertex_state(C) == 0; } -static int mesh_customdata_crease_vertex_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_crease_vertex_add_exec(bContext *C, wmOperator * /*op*/) { return mesh_customdata_add_exec__internal(C, BM_VERT, CD_CREASE); } @@ -1093,7 +1093,7 @@ static bool mesh_customdata_crease_vertex_clear_poll(bContext *C) return (mesh_customdata_crease_vertex_state(C) == 1); } -static int mesh_customdata_crease_vertex_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int mesh_customdata_crease_vertex_clear_exec(bContext *C, wmOperator * /*op*/) { return mesh_customdata_clear_exec__internal(C, BM_VERT, CD_CREASE); } diff --git a/source/blender/editors/mesh/meshtools.cc b/source/blender/editors/mesh/meshtools.cc index 917e019c05a..2210cc67bff 100644 --- a/source/blender/editors/mesh/meshtools.cc +++ b/source/blender/editors/mesh/meshtools.cc @@ -877,7 +877,7 @@ void ED_mesh_mirror_topo_table_begin(Object *ob, Mesh *me_eval) ED_mesh_mirrtopo_init(em_mirror, me_mirror, &mesh_topo_store, false); } -void ED_mesh_mirror_topo_table_end(Object *UNUSED(ob)) +void ED_mesh_mirror_topo_table_end(Object * /*ob*/) { /* TODO: store this in object/object-data (keep unused argument for now). */ ED_mesh_mirrtopo_free(&mesh_topo_store); diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index a24b6ed4830..3ce39b695e0 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -372,8 +372,8 @@ float ED_object_new_primitive_matrix(bContext *C, /** \name Add Object Operator * \{ */ -static void view_align_update(struct Main *UNUSED(main), - struct Scene *UNUSED(scene), +static void view_align_update(struct Main * /*main*/, + struct Scene * /*scene*/, struct PointerRNA *ptr) { RNA_struct_idprops_unset(ptr, "rotation"); @@ -1475,7 +1475,7 @@ static int object_gpencil_add_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static void object_add_ui(bContext *UNUSED(C), wmOperator *op) +static void object_add_ui(bContext * /*C*/, wmOperator *op) { uiLayout *layout = op->layout; @@ -3467,7 +3467,7 @@ static int object_convert_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static void object_convert_ui(bContext *UNUSED(C), wmOperator *op) +static void object_convert_ui(bContext * /*C*/, wmOperator *op) { uiLayout *layout = op->layout; diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index 424bf3c73e2..0fc97f96dbf 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -522,7 +522,7 @@ void ED_object_modifier_copy_to_object(bContext *C, DEG_relations_tag_update(bmain); } -bool ED_object_modifier_convert_psys_to_mesh(ReportList *UNUSED(reports), +bool ED_object_modifier_convert_psys_to_mesh(ReportList * /*reports*/, Main *bmain, Depsgraph *depsgraph, Scene *scene, @@ -941,7 +941,7 @@ bool ED_object_modifier_apply(Main *bmain, } bool ED_object_modifier_copy( - ReportList *UNUSED(reports), Main *bmain, Scene *scene, Object *ob, ModifierData *md) + ReportList * /*reports*/, Main *bmain, Scene *scene, Object *ob, ModifierData *md) { if (md->type == eModifierType_ParticleSystem) { ModifierData *nmd = object_copy_particle_system( @@ -986,8 +986,8 @@ static int modifier_add_exec(bContext *C, wmOperator *op) } static const EnumPropertyItem *modifier_add_itemf(bContext *C, - PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), + PointerRNA * /*ptr*/, + PropertyRNA * /*prop*/, bool *r_free) { Object *ob = ED_object_active_context(C); @@ -1588,8 +1588,8 @@ static int modifier_apply_as_shapekey_invoke(bContext *C, wmOperator *op, const return retval; } -static char *modifier_apply_as_shapekey_get_description(struct bContext *UNUSED(C), - struct wmOperatorType *UNUSED(op), +static char *modifier_apply_as_shapekey_get_description(struct bContext * /*C*/, + struct wmOperatorType * /*op*/, struct PointerRNA *values) { bool keep = RNA_boolean_get(values, "keep_modifier"); @@ -1647,7 +1647,7 @@ static int modifier_convert_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int modifier_convert_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int modifier_convert_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return modifier_convert_exec(C, op); @@ -1940,7 +1940,7 @@ static int multires_higher_levels_delete_exec(bContext *C, wmOperator *op) static int multires_higher_levels_delete_invoke(bContext *C, wmOperator *op, - const wmEvent *UNUSED(event)) + const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return multires_higher_levels_delete_exec(C, op); @@ -2016,7 +2016,7 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int multires_subdivide_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int multires_subdivide_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return multires_subdivide_exec(C, op); @@ -2091,7 +2091,7 @@ static int multires_reshape_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int multires_reshape_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int multires_reshape_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return multires_reshape_exec(C, op); @@ -2148,7 +2148,7 @@ static int multires_external_save_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int multires_external_save_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int multires_external_save_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { Object *ob = ED_object_active_context(C); Mesh *me = static_cast(ob->data); @@ -2213,7 +2213,7 @@ void OBJECT_OT_multires_external_save(wmOperatorType *ot) /** \name Multires Pack Operator * \{ */ -static int multires_external_pack_exec(bContext *C, wmOperator *UNUSED(op)) +static int multires_external_pack_exec(bContext *C, wmOperator * /*op*/) { Object *ob = ED_object_active_context(C); Mesh *me = static_cast(ob->data); @@ -2270,7 +2270,7 @@ static int multires_base_apply_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int multires_base_apply_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int multires_base_apply_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return multires_base_apply_exec(C, op); @@ -2322,7 +2322,7 @@ static int multires_unsubdivide_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int multires_unsubdivide_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int multires_unsubdivide_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return multires_unsubdivide_exec(C, op); @@ -2376,9 +2376,7 @@ static int multires_rebuild_subdiv_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int multires_rebuild_subdiv_invoke(bContext *C, - wmOperator *op, - const wmEvent *UNUSED(event)) +static int multires_rebuild_subdiv_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return multires_rebuild_subdiv_exec(C, op); @@ -2453,7 +2451,7 @@ static void skin_root_clear(BMVert *bm_vert, GSet *visited, const int cd_vert_sk } } -static int skin_root_mark_exec(bContext *C, wmOperator *UNUSED(op)) +static int skin_root_mark_exec(bContext *C, wmOperator * /*op*/) { Object *ob = CTX_data_edit_object(C); BMEditMesh *em = BKE_editmesh_from_object(ob); @@ -2562,7 +2560,7 @@ void OBJECT_OT_skin_loose_mark_clear(wmOperatorType *ot) RNA_def_enum(ot->srna, "action", action_items, SKIN_LOOSE_MARK, "Action", nullptr); } -static int skin_radii_equalize_exec(bContext *C, wmOperator *UNUSED(op)) +static int skin_radii_equalize_exec(bContext *C, wmOperator * /*op*/) { Object *ob = CTX_data_edit_object(C); BMEditMesh *em = BKE_editmesh_from_object(ob); @@ -2750,7 +2748,7 @@ static int skin_armature_create_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int skin_armature_create_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int skin_armature_create_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return skin_armature_create_exec(C, op); @@ -2827,7 +2825,7 @@ static int correctivesmooth_bind_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int correctivesmooth_bind_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int correctivesmooth_bind_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return correctivesmooth_bind_exec(C, op); @@ -2902,7 +2900,7 @@ static int meshdeform_bind_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int meshdeform_bind_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int meshdeform_bind_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return meshdeform_bind_exec(C, op); @@ -2956,7 +2954,7 @@ static int explode_refresh_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int explode_refresh_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int explode_refresh_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return explode_refresh_exec(C, op); @@ -3008,7 +3006,7 @@ static void oceanbake_free(void *customdata) } /* called by oceanbake, only to check job 'stop' value */ -static int oceanbake_breakjob(void *UNUSED(customdata)) +static int oceanbake_breakjob(void * /*customdata*/) { // OceanBakeJob *ob = (OceanBakeJob *)customdata; // return *(ob->stop); @@ -3157,7 +3155,7 @@ static int ocean_bake_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int ocean_bake_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int ocean_bake_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return ocean_bake_exec(C, op); @@ -3234,7 +3232,7 @@ static int laplaciandeform_bind_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int laplaciandeform_bind_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int laplaciandeform_bind_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return laplaciandeform_bind_exec(C, op); @@ -3301,7 +3299,7 @@ static int surfacedeform_bind_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int surfacedeform_bind_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int surfacedeform_bind_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { if (edit_modifier_invoke_properties(C, op)) { return surfacedeform_bind_exec(C, op); @@ -3384,7 +3382,7 @@ void OBJECT_OT_geometry_nodes_input_attribute_toggle(wmOperatorType *ot) /** \name Copy and Assign Geometry Node Group operator * \{ */ -static int geometry_node_tree_copy_assign_exec(bContext *C, wmOperator *UNUSED(op)) +static int geometry_node_tree_copy_assign_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); Object *ob = ED_object_active_context(C); diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index 9f59549d3db..8358bf632d3 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -286,7 +286,7 @@ static void voxel_size_parallel_lines_draw(uint pos3d, immEnd(); } -static void voxel_size_edit_draw(const bContext *C, ARegion *UNUSED(ar), void *arg) +static void voxel_size_edit_draw(const bContext *C, ARegion * /*ar*/, void *arg) { VoxelSizeEditCustomData *cd = static_cast(arg); diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index 8ba460b1c6d..6604e3da4d2 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -469,7 +469,7 @@ void OBJECT_OT_scale_clear(wmOperatorType *ot) /** \name Clear Origin Operator * \{ */ -static int object_origin_clear_exec(bContext *C, wmOperator *UNUSED(op)) +static int object_origin_clear_exec(bContext *C, wmOperator * /*op*/) { float *v1, *v3; float mat[3][3]; @@ -1066,7 +1066,7 @@ static int apply_objects_internal(bContext *C, return OPERATOR_FINISHED; } -static int visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op)) +static int visual_transform_apply_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); @@ -1123,7 +1123,7 @@ static int object_transform_apply_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int object_transform_apply_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int object_transform_apply_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { Object *ob = ED_object_active_context(C); @@ -1181,7 +1181,7 @@ void OBJECT_OT_transform_apply(wmOperatorType *ot) /** \name Apply Parent Inverse Operator * \{ */ -static int object_parent_inverse_apply_exec(bContext *C, wmOperator *UNUSED(op)) +static int object_parent_inverse_apply_exec(bContext *C, wmOperator * /*op*/) { CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) { if (ob->parent == nullptr) { diff --git a/source/blender/editors/object/object_vgroup.cc b/source/blender/editors/object/object_vgroup.cc index 0e671257972..02a247dd15e 100644 --- a/source/blender/editors/object/object_vgroup.cc +++ b/source/blender/editors/object/object_vgroup.cc @@ -715,7 +715,7 @@ static const EnumPropertyItem WT_vertex_group_select_item[] = { }; const EnumPropertyItem *ED_object_vgroup_selection_itemf_helper(const bContext *C, - PointerRNA *UNUSED(ptr), + PointerRNA * /*ptr*/, PropertyRNA *prop, bool *r_free, const uint selection_mask) @@ -1340,7 +1340,7 @@ static void getVerticalAndHorizontalChange(const float norm[3], * `coord` is a point on the plane. */ static void moveCloserToDistanceFromPlane(Depsgraph *depsgraph, - Scene *UNUSED(scene), + Scene * /*scene*/, Object *ob, Mesh *me, int index, @@ -1522,7 +1522,7 @@ static void moveCloserToDistanceFromPlane(Depsgraph *depsgraph, /* this is used to try to smooth a surface by only adjusting the nonzero weights of a vertex * but it could be used to raise or lower an existing 'bump.' */ static void vgroup_fix( - const bContext *C, Scene *UNUSED(scene), Object *ob, float distToBe, float strength, float cp) + const bContext *C, Scene * /*scene*/, Object *ob, float distToBe, float strength, float cp) { using namespace blender; Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); @@ -1580,7 +1580,7 @@ static void vgroup_fix( static void vgroup_levels_subset(Object *ob, const bool *vgroup_validmap, const int vgroup_tot, - const int UNUSED(subset_count), + const int /*subset_count*/, const float offset, const float gain) { @@ -1841,7 +1841,7 @@ static void vgroup_lock_all(Object *ob, int action, int mask) static void vgroup_invert_subset(Object *ob, const bool *vgroup_validmap, const int vgroup_tot, - const int UNUSED(subset_count), + const int /*subset_count*/, const bool auto_assign, const bool auto_remove) { @@ -2227,7 +2227,7 @@ static int vgroup_limit_total_subset(Object *ob, static void vgroup_clean_subset(Object *ob, const bool *vgroup_validmap, const int vgroup_tot, - const int UNUSED(subset_count), + const int /*subset_count*/, const float epsilon, const bool keep_single) { @@ -2258,7 +2258,7 @@ static void vgroup_clean_subset(Object *ob, static void vgroup_quantize_subset(Object *ob, const bool *vgroup_validmap, const int vgroup_tot, - const int UNUSED(subset_count), + const int /*subset_count*/, const int steps) { MDeformVert **dvert_array = nullptr; @@ -2879,7 +2879,7 @@ static bool vertex_group_vert_select_mesh_poll(bContext *C) /** \name Vertex Group Add Operator * \{ */ -static int vertex_group_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_group_add_exec(bContext *C, wmOperator * /*op*/) { Object *ob = ED_object_context(C); @@ -2966,7 +2966,7 @@ void OBJECT_OT_vertex_group_remove(wmOperatorType *ot) /** \name Vertex Group Assign Operator * \{ */ -static int vertex_group_assign_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_group_assign_exec(bContext *C, wmOperator * /*op*/) { ToolSettings *ts = CTX_data_tool_settings(C); Object *ob = ED_object_context(C); @@ -3097,7 +3097,7 @@ void OBJECT_OT_vertex_group_remove_from(wmOperatorType *ot) /** \name Vertex Group Select Operator * \{ */ -static int vertex_group_select_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_group_select_exec(bContext *C, wmOperator * /*op*/) { Object *ob = ED_object_context(C); @@ -3133,7 +3133,7 @@ void OBJECT_OT_vertex_group_select(wmOperatorType *ot) /** \name Vertex Group Deselect Operator * \{ */ -static int vertex_group_deselect_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_group_deselect_exec(bContext *C, wmOperator * /*op*/) { Object *ob = ED_object_context(C); @@ -3165,7 +3165,7 @@ void OBJECT_OT_vertex_group_deselect(wmOperatorType *ot) /** \name Vertex Group Copy Operator * \{ */ -static int vertex_group_copy_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_group_copy_exec(bContext *C, wmOperator * /*op*/) { Object *ob = ED_object_context(C); @@ -3250,7 +3250,7 @@ void OBJECT_OT_vertex_group_levels(wmOperatorType *ot) /** \name Vertex Group Normalize Operator * \{ */ -static int vertex_group_normalize_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_group_normalize_exec(bContext *C, wmOperator * /*op*/) { Object *ob = ED_object_context(C); bool changed; @@ -3443,8 +3443,8 @@ static int vertex_group_lock_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static char *vertex_group_lock_description(bContext *UNUSED(C), - wmOperatorType *UNUSED(op), +static char *vertex_group_lock_description(bContext * /*C*/, + wmOperatorType * /*op*/, PointerRNA *params) { int action = RNA_enum_get(params, "action"); @@ -3967,8 +3967,8 @@ static int set_active_group_exec(bContext *C, wmOperator *op) } static const EnumPropertyItem *vgroup_itemf(bContext *C, - PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), + PointerRNA * /*ptr*/, + PropertyRNA * /*prop*/, bool *r_free) { if (C == nullptr) { @@ -4558,7 +4558,7 @@ void OBJECT_OT_vertex_weight_set_active(wmOperatorType *ot) /** \name Vertex Group Normalize Active Vertex Operator * \{ */ -static int vertex_weight_normalize_active_vertex_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_weight_normalize_active_vertex_exec(bContext *C, wmOperator * /*op*/) { Object *ob = ED_object_context(C); ToolSettings *ts = CTX_data_tool_settings(C); @@ -4597,7 +4597,7 @@ void OBJECT_OT_vertex_weight_normalize_active_vertex(wmOperatorType *ot) /** \name Vertex Group Copy Weights from Active Operator * \{ */ -static int vertex_weight_copy_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_weight_copy_exec(bContext *C, wmOperator * /*op*/) { Object *ob = ED_object_context(C); ToolSettings *ts = CTX_data_tool_settings(C); diff --git a/source/blender/editors/render/render_internal.cc b/source/blender/editors/render/render_internal.cc index 7f6a14126e0..e66cabbc9f8 100644 --- a/source/blender/editors/render/render_internal.cc +++ b/source/blender/editors/render/render_internal.cc @@ -808,7 +808,7 @@ static int render_breakjob(void *rjv) * For exec() when there is no render job * NOTE: this won't check for the escape key being pressed, but doing so isn't thread-safe. */ -static int render_break(void *UNUSED(rjv)) +static int render_break(void * /*rjv*/) { if (G.is_break) { return 1; diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc index e91bffce2c2..d5e3d1171cd 100644 --- a/source/blender/editors/render/render_opengl.cc +++ b/source/blender/editors/render/render_opengl.cc @@ -1310,8 +1310,8 @@ static int screen_opengl_render_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static char *screen_opengl_render_description(struct bContext *UNUSED(C), - struct wmOperatorType *UNUSED(ot), +static char *screen_opengl_render_description(struct bContext * /*C*/, + struct wmOperatorType * /*ot*/, struct PointerRNA *ptr) { if (!RNA_boolean_get(ptr, "animation")) { diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index 2e844aa5185..ad24f46f923 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -1039,7 +1039,7 @@ static void action_preview_render(IconPreview *preview, IconPreviewSize *preview * \{ */ /* inside thread, called by renderer, sets job update value */ -static void shader_preview_update(void *spv, RenderResult *UNUSED(rr), struct rcti *UNUSED(rect)) +static void shader_preview_update(void *spv, RenderResult * /*rr*/, struct rcti * /*rect*/) { ShaderPreview *sp = static_cast(spv); @@ -1054,7 +1054,7 @@ static int shader_preview_break(void *spv) return *(sp->stop); } -static void shader_preview_updatejob(void *UNUSED(spv)) +static void shader_preview_updatejob(void * /*spv*/) { } @@ -1490,7 +1490,7 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat static void common_preview_startjob(void *customdata, short *stop, short *do_update, - float *UNUSED(progress)) + float * /*progress*/) { ShaderPreview *sp = static_cast(customdata); @@ -1798,10 +1798,7 @@ void PreviewLoadJob::push_load_request(PreviewImage *preview, const eIconSizes i BLI_thread_queue_push(todo_queue_, &requested_previews_.back()); } -void PreviewLoadJob::run_fn(void *customdata, - short *stop, - short *do_update, - float *UNUSED(progress)) +void PreviewLoadJob::run_fn(void *customdata, short *stop, short *do_update, float * /*progress*/) { PreviewLoadJob *job_data = static_cast(customdata); @@ -2109,7 +2106,7 @@ void ED_preview_shader_job(const bContext *C, WM_jobs_start(CTX_wm_manager(C), wm_job); } -void ED_preview_kill_jobs(wmWindowManager *wm, Main *UNUSED(bmain)) +void ED_preview_kill_jobs(wmWindowManager *wm, Main * /*bmain*/) { if (wm) { /* This is called to stop all preview jobs before scene data changes, to diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc index 6802798adb3..25d5ceb8216 100644 --- a/source/blender/editors/render/render_shading.cc +++ b/source/blender/editors/render/render_shading.cc @@ -163,7 +163,7 @@ static bool object_materials_supported_poll(bContext *C) /** \name Material Slot Add Operator * \{ */ -static int material_slot_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int material_slot_add_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); Object *ob = ED_object_context(C); @@ -259,7 +259,7 @@ void OBJECT_OT_material_slot_remove(wmOperatorType *ot) /** \name Material Slot Assign Operator * \{ */ -static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op)) +static int material_slot_assign_exec(bContext *C, wmOperator * /*op*/) { View3D *v3d = CTX_wm_view3d(C); bool changed_multi = false; @@ -475,7 +475,7 @@ static int material_slot_de_select(bContext *C, bool select) return (changed_multi) ? OPERATOR_FINISHED : OPERATOR_CANCELLED; } -static int material_slot_select_exec(bContext *C, wmOperator *UNUSED(op)) +static int material_slot_select_exec(bContext *C, wmOperator * /*op*/) { return material_slot_de_select(C, true); } @@ -494,7 +494,7 @@ void OBJECT_OT_material_slot_select(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; } -static int material_slot_deselect_exec(bContext *C, wmOperator *UNUSED(op)) +static int material_slot_deselect_exec(bContext *C, wmOperator * /*op*/) { return material_slot_de_select(C, false); } @@ -519,7 +519,7 @@ void OBJECT_OT_material_slot_deselect(wmOperatorType *ot) /** \name Material Slot Copy Operator * \{ */ -static int material_slot_copy_exec(bContext *C, wmOperator *UNUSED(op)) +static int material_slot_copy_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); Object *ob = ED_object_context(C); @@ -736,7 +736,7 @@ void OBJECT_OT_material_slot_remove_unused(wmOperatorType *ot) /** \name New Material Operator * \{ */ -static int new_material_exec(bContext *C, wmOperator *UNUSED(op)) +static int new_material_exec(bContext *C, wmOperator * /*op*/) { Material *ma = static_cast( CTX_data_pointer_get_type(C, "material", &RNA_Material).data); @@ -812,7 +812,7 @@ void MATERIAL_OT_new(wmOperatorType *ot) /** \name New Texture Operator * \{ */ -static int new_texture_exec(bContext *C, wmOperator *UNUSED(op)) +static int new_texture_exec(bContext *C, wmOperator * /*op*/) { Tex *tex = static_cast(CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data); Main *bmain = CTX_data_main(C); @@ -865,7 +865,7 @@ void TEXTURE_OT_new(wmOperatorType *ot) /** \name new world operator * \{ */ -static int new_world_exec(bContext *C, wmOperator *UNUSED(op)) +static int new_world_exec(bContext *C, wmOperator * /*op*/) { World *wo = static_cast(CTX_data_pointer_get_type(C, "world", &RNA_World).data); Main *bmain = CTX_data_main(C); @@ -982,7 +982,7 @@ static bool view_layer_remove_poll(bContext *C) return (scene->view_layers.first != scene->view_layers.last); } -static int view_layer_remove_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_remove_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); @@ -1018,7 +1018,7 @@ void SCENE_OT_view_layer_remove(wmOperatorType *ot) /** \name View Layer Add AOV Operator * \{ */ -static int view_layer_add_aov_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_add_aov_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -1066,7 +1066,7 @@ void SCENE_OT_view_layer_add_aov(wmOperatorType *ot) /** \name View Layer Remove AOV Operator * \{ */ -static int view_layer_remove_aov_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_remove_aov_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -1178,7 +1178,7 @@ void SCENE_OT_view_layer_add_lightgroup(wmOperatorType *ot) /** \name View Layer Remove Lightgroup Operator * \{ */ -static int view_layer_remove_lightgroup_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_remove_lightgroup_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -1238,7 +1238,7 @@ static GSet *get_used_lightgroups(Scene *scene) return used_lightgroups; } -static int view_layer_add_used_lightgroups_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_add_used_lightgroups_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -1284,7 +1284,7 @@ void SCENE_OT_view_layer_add_used_lightgroups(wmOperatorType *ot) /** \name View Layer Remove Unused Lightgroups Operator * \{ */ -static int view_layer_remove_unused_lightgroups_exec(bContext *C, wmOperator *UNUSED(op)) +static int view_layer_remove_unused_lightgroups_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -1411,7 +1411,7 @@ static int light_cache_bake_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static int light_cache_bake_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int light_cache_bake_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { wmWindowManager *wm = CTX_wm_manager(C); wmWindow *win = CTX_wm_window(C); @@ -1505,7 +1505,7 @@ static bool light_cache_free_poll(bContext *C) return scene->eevee.light_cache_data; } -static int light_cache_free_exec(bContext *C, wmOperator *UNUSED(op)) +static int light_cache_free_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); @@ -1555,7 +1555,7 @@ static bool render_view_remove_poll(bContext *C) return scene->r.actview > 1; } -static int render_view_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int render_view_add_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); @@ -1587,7 +1587,7 @@ void SCENE_OT_render_view_add(wmOperatorType *ot) /** \name Render View Add Operator * \{ */ -static int render_view_remove_exec(bContext *C, wmOperator *UNUSED(op)) +static int render_view_remove_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); SceneRenderView *rv = static_cast( @@ -1651,7 +1651,7 @@ static bool freestyle_active_module_poll(bContext *C) return module != nullptr; } -static int freestyle_module_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int freestyle_module_add_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -1683,7 +1683,7 @@ void SCENE_OT_freestyle_module_add(wmOperatorType *ot) /** \name Free Style Module Remove Operator * \{ */ -static int freestyle_module_remove_exec(bContext *C, wmOperator *UNUSED(op)) +static int freestyle_module_remove_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -1770,7 +1770,7 @@ void SCENE_OT_freestyle_module_move(wmOperatorType *ot) /** \name Free Style Line Set Add Operator * \{ */ -static int freestyle_lineset_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int freestyle_lineset_add_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); @@ -1815,7 +1815,7 @@ static bool freestyle_active_lineset_poll(bContext *C) return BKE_freestyle_lineset_get_active(&view_layer->freestyle_config) != nullptr; } -static int freestyle_lineset_copy_exec(bContext *C, wmOperator *UNUSED(op)) +static int freestyle_lineset_copy_exec(bContext *C, wmOperator * /*op*/) { ViewLayer *view_layer = CTX_data_view_layer(C); @@ -1845,7 +1845,7 @@ void SCENE_OT_freestyle_lineset_copy(wmOperatorType *ot) /** \name Free Style Line Set Paste Operator * \{ */ -static int freestyle_lineset_paste_exec(bContext *C, wmOperator *UNUSED(op)) +static int freestyle_lineset_paste_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -1879,7 +1879,7 @@ void SCENE_OT_freestyle_lineset_paste(wmOperatorType *ot) /** \name Free Style Line Set Remove Operator * \{ */ -static int freestyle_lineset_remove_exec(bContext *C, wmOperator *UNUSED(op)) +static int freestyle_lineset_remove_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -2517,7 +2517,7 @@ void TEXTURE_OT_slot_move(wmOperatorType *ot) * \{ */ /* material copy/paste */ -static int copy_material_exec(bContext *C, wmOperator *UNUSED(op)) +static int copy_material_exec(bContext *C, wmOperator * /*op*/) { Material *ma = static_cast( CTX_data_pointer_get_type(C, "material", &RNA_Material).data); @@ -2552,7 +2552,7 @@ void MATERIAL_OT_copy(wmOperatorType *ot) /** \name Material Paste Operator * \{ */ -static int paste_material_exec(bContext *C, wmOperator *UNUSED(op)) +static int paste_material_exec(bContext *C, wmOperator * /*op*/) { Material *ma = static_cast( CTX_data_pointer_get_type(C, "material", &RNA_Material).data); @@ -2661,7 +2661,7 @@ static void paste_mtex_copybuf(ID *id) /** \name Texture Slot Copy Operator * \{ */ -static int copy_mtex_exec(bContext *C, wmOperator *UNUSED(op)) +static int copy_mtex_exec(bContext *C, wmOperator * /*op*/) { ID *id = CTX_data_pointer_get_type(C, "texture_slot", &RNA_TextureSlot).owner_id; @@ -2705,7 +2705,7 @@ void TEXTURE_OT_slot_copy(wmOperatorType *ot) /** \name Texture Slot Paste Operator * \{ */ -static int paste_mtex_exec(bContext *C, wmOperator *UNUSED(op)) +static int paste_mtex_exec(bContext *C, wmOperator * /*op*/) { ID *id = CTX_data_pointer_get_type(C, "texture_slot", &RNA_TextureSlot).owner_id; diff --git a/source/blender/editors/render/render_update.cc b/source/blender/editors/render/render_update.cc index 7cefcf9815e..8aadb9edf6a 100644 --- a/source/blender/editors/render/render_update.cc +++ b/source/blender/editors/render/render_update.cc @@ -226,13 +226,13 @@ void ED_render_view_layer_changed(Main *bmain, bScreen *screen) * we can get rid of the manual dependency checks. * \{ */ -static void material_changed(Main *UNUSED(bmain), Material *ma) +static void material_changed(Main * /*bmain*/, Material *ma) { /* icons */ BKE_icon_changed(BKE_icon_id_ensure(&ma->id)); } -static void lamp_changed(Main *UNUSED(bmain), Light *la) +static void lamp_changed(Main * /*bmain*/, Light *la) { /* icons */ BKE_icon_changed(BKE_icon_id_ensure(&la->id)); @@ -265,7 +265,7 @@ static void texture_changed(Main *bmain, Tex *tex) } } -static void world_changed(Main *UNUSED(bmain), World *wo) +static void world_changed(Main * /*bmain*/, World *wo) { /* icons */ BKE_icon_changed(BKE_icon_id_ensure(&wo->id)); diff --git a/source/blender/editors/render/render_view.cc b/source/blender/editors/render/render_view.cc index 7569b3600a1..f0427bf8683 100644 --- a/source/blender/editors/render/render_view.cc +++ b/source/blender/editors/render/render_view.cc @@ -256,7 +256,7 @@ ScrArea *render_view_open(bContext *C, int mx, int my, ReportList *reports) /*************************** cancel render viewer **********************/ -static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op)) +static int render_view_cancel_exec(bContext *C, wmOperator * /*op*/) { wmWindow *win = CTX_wm_window(C); ScrArea *area = CTX_wm_area(C); diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc index 00130e6d19e..0d2c2d3f0c9 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc @@ -418,7 +418,7 @@ struct AddOperationExecutor { *surface_bvh_eval_.tree, brush_pos_su, brush_radius_su, - [&](const int index, const float3 &UNUSED(co), const float UNUSED(dist_sq)) { + [&](const int index, const float3 & /*co*/, const float /*dist_sq*/) { const MLoopTri &looptri = surface_looptris_eval_[index]; const float3 v0_su = surface_verts_eval_[surface_loops_eval_[looptri.tri[0]].v].co; const float3 v1_su = surface_verts_eval_[surface_loops_eval_[looptri.tri[1]].v].co; @@ -436,7 +436,7 @@ struct AddOperationExecutor { *surface_bvh_eval_.tree, brush_pos_su, brush_radius_su, - [&](const int index, const float3 &UNUSED(co), const float UNUSED(dist_sq)) { + [&](const int index, const float3 & /*co*/, const float /*dist_sq*/) { selected_looptri_indices.append(index); }); } diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc index 2cd4528503e..78e2d55e6b9 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc @@ -234,7 +234,7 @@ struct DensityAddOperationExecutor { new_roots_kdtree, root_pos_cu, brush_settings_->minimum_distance, - [&](const int other_new_i, const float *UNUSED(co), float UNUSED(dist_sq)) { + [&](const int other_new_i, const float * /*co*/, float /*dist_sq*/) { if (other_new_i == -1) { new_curve_skipped[new_i] = true; return false; @@ -415,7 +415,7 @@ struct DensityAddOperationExecutor { *surface_bvh_eval_.tree, brush_pos_su, brush_radius_su, - [&](const int index, const float3 &UNUSED(co), const float UNUSED(dist_sq)) { + [&](const int index, const float3 & /*co*/, const float /*dist_sq*/) { selected_looptri_indices.append(index); }); @@ -687,7 +687,7 @@ struct DensitySubtractOperationExecutor { root_points_kdtree_, orig_pos_cu, minimum_distance_, - [&](const int other_curve_i, const float *UNUSED(co), float UNUSED(dist_sq)) { + [&](const int other_curve_i, const float * /*co*/, float /*dist_sq*/) { if (other_curve_i == curve_i) { return true; } @@ -772,7 +772,7 @@ struct DensitySubtractOperationExecutor { root_points_kdtree_, pos_cu, minimum_distance_, - [&](const int other_curve_i, const float *UNUSED(co), float UNUSED(dist_sq)) { + [&](const int other_curve_i, const float * /*co*/, float /*dist_sq*/) { if (other_curve_i == curve_i) { return true; } diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc index 3068ce9417b..6366da310b6 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc @@ -153,7 +153,7 @@ struct SculptCurvesBrushStrokeData { static bool stroke_get_location(bContext *C, float out[3], const float mouse[2], - bool UNUSED(force_original)) + bool /*force_original*/) { out[0] = mouse[0]; out[1] = mouse[1]; @@ -170,7 +170,7 @@ static bool stroke_test_start(bContext *C, struct wmOperator *op, const float mo static void stroke_update_step(bContext *C, wmOperator *op, - PaintStroke *UNUSED(stroke), + PaintStroke * /*stroke*/, PointerRNA *stroke_element) { SculptCurvesBrushStrokeData *op_data = static_cast( @@ -448,7 +448,7 @@ static int select_random_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static void select_random_ui(bContext *UNUSED(C), wmOperator *op) +static void select_random_ui(bContext * /*C*/, wmOperator *op) { uiLayout *layout = op->layout; @@ -1003,7 +1003,7 @@ static int calculate_points_per_side(bContext *C, MinDistanceEditData &op_data) return std::min(300, needed_points); } -static void min_distance_edit_draw(bContext *C, int UNUSED(x), int UNUSED(y), void *customdata) +static void min_distance_edit_draw(bContext *C, int /*x*/, int /*y*/, void *customdata) { Scene *scene = CTX_data_scene(C); MinDistanceEditData &op_data = *static_cast(customdata); diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc index 619002a1bea..23cf65cd90a 100644 --- a/source/blender/editors/sculpt_paint/paint_image.cc +++ b/source/blender/editors/sculpt_paint/paint_image.cc @@ -546,7 +546,7 @@ static int grab_clone_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -static void grab_clone_cancel(bContext *UNUSED(C), wmOperator *op) +static void grab_clone_cancel(bContext * /*C*/, wmOperator *op) { GrabClone *cmv = static_cast(op->customdata); MEM_delete(cmv); @@ -911,7 +911,7 @@ void PAINT_OT_texture_paint_toggle(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static int brush_colors_flip_exec(bContext *C, wmOperator *UNUSED(op)) +static int brush_colors_flip_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings; diff --git a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc index 5d50cdb4d1f..a5dd558e27a 100644 --- a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc +++ b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc @@ -81,14 +81,14 @@ class ImagePaintMode : public AbstractPaintMode { public: void *paint_new_stroke(bContext *C, wmOperator *op, - Object *UNUSED(ob), + Object * /*ob*/, const float UNUSED(mouse[2]), int mode) override { return paint_2d_new_stroke(C, op, mode); } - void paint_stroke(bContext *UNUSED(C), + void paint_stroke(bContext * /*C*/, void *stroke_handle, float prev_mouse[2], float mouse[2], @@ -111,9 +111,9 @@ class ImagePaintMode : public AbstractPaintMode { } void paint_gradient_fill(const bContext *C, - const Scene *UNUSED(scene), + const Scene * /*scene*/, Brush *brush, - struct PaintStroke *UNUSED(stroke), + struct PaintStroke * /*stroke*/, void *stroke_handle, float mouse_start[2], float mouse_end[2]) override @@ -143,7 +143,7 @@ class ImagePaintMode : public AbstractPaintMode { class ProjectionPaintMode : public AbstractPaintMode { public: void *paint_new_stroke( - bContext *C, wmOperator *UNUSED(op), Object *ob, const float mouse[2], int mode) override + bContext *C, wmOperator * /*op*/, Object *ob, const float mouse[2], int mode) override { return paint_proj_new_stroke(C, ob, mouse, mode); } @@ -240,7 +240,7 @@ struct PaintOperation { } }; -static void gradient_draw_line(bContext *UNUSED(C), int x, int y, void *customdata) +static void gradient_draw_line(bContext * /*C*/, int x, int y, void *customdata) { PaintOperation *pop = (PaintOperation *)customdata; @@ -330,7 +330,7 @@ static PaintOperation *texture_paint_init(bContext *C, wmOperator *op, const flo } static void paint_stroke_update_step(bContext *C, - wmOperator *UNUSED(op), + wmOperator * /*op*/, struct PaintStroke *stroke, PointerRNA *itemptr) { diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc index a11cbfa52af..ae1db0b1ce4 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex.cc @@ -398,7 +398,7 @@ static float wpaint_blend(const VPaint *wp, float weight, const float alpha, float paintval, - const float UNUSED(brush_alpha_value), + const float /*brush_alpha_value*/, const bool do_flip) { const Brush *brush = wp->paint.brush; @@ -1902,7 +1902,7 @@ static float wpaint_get_active_weight(const MDeformVert *dv, const WeightPaintIn static void do_wpaint_precompute_weight_cb_ex(void *__restrict userdata, const int n, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { SculptThreadedTaskData *data = (SculptThreadedTaskData *)userdata; const MDeformVert *dv = &data->wpi->dvert[n]; @@ -1934,7 +1934,7 @@ static void precompute_weight_values( static void do_wpaint_brush_blur_task_cb_ex(void *__restrict userdata, const int n, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { SculptThreadedTaskData *data = (SculptThreadedTaskData *)userdata; SculptSession *ss = data->ob->sculpt; @@ -2027,7 +2027,7 @@ static void do_wpaint_brush_blur_task_cb_ex(void *__restrict userdata, static void do_wpaint_brush_smear_task_cb_ex(void *__restrict userdata, const int n, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { SculptThreadedTaskData *data = (SculptThreadedTaskData *)userdata; SculptSession *ss = data->ob->sculpt; @@ -2140,7 +2140,7 @@ static void do_wpaint_brush_smear_task_cb_ex(void *__restrict userdata, static void do_wpaint_brush_draw_task_cb_ex(void *__restrict userdata, const int n, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { SculptThreadedTaskData *data = (SculptThreadedTaskData *)userdata; SculptSession *ss = data->ob->sculpt; @@ -2212,8 +2212,9 @@ static void do_wpaint_brush_draw_task_cb_ex(void *__restrict userdata, BKE_pbvh_vertex_iter_end; } -static void do_wpaint_brush_calc_average_weight_cb_ex( - void *__restrict userdata, const int n, const TaskParallelTLS *__restrict UNUSED(tls)) +static void do_wpaint_brush_calc_average_weight_cb_ex(void *__restrict userdata, + const int n, + const TaskParallelTLS *__restrict /*tls*/) { SculptThreadedTaskData *data = (SculptThreadedTaskData *)userdata; SculptSession *ss = data->ob->sculpt; @@ -2263,7 +2264,7 @@ static void do_wpaint_brush_calc_average_weight_cb_ex( } static void calculate_average_weight(SculptThreadedTaskData *data, - PBVHNode **UNUSED(nodes), + PBVHNode ** /*nodes*/, int totnode) { WPaintAverageAccum *accum = (WPaintAverageAccum *)MEM_mallocN(sizeof(*accum) * totnode, @@ -2483,7 +2484,7 @@ static void wpaint_do_symmetrical_brush_actions( } static void wpaint_stroke_update_step(bContext *C, - wmOperator *UNUSED(op), + wmOperator * /*op*/, PaintStroke *stroke, PointerRNA *itemptr) { @@ -2952,7 +2953,7 @@ static bool vpaint_stroke_test_start(bContext *C, wmOperator *op, const float mo template static void do_vpaint_brush_blur_loops(bContext *C, - Sculpt *UNUSED(sd), + Sculpt * /*sd*/, VPaint *vp, VPaintData *vpd, Object *ob, @@ -3097,7 +3098,7 @@ static void do_vpaint_brush_blur_loops(bContext *C, template static void do_vpaint_brush_blur_verts(bContext *C, - Sculpt *UNUSED(sd), + Sculpt * /*sd*/, VPaint *vp, VPaintData *vpd, Object *ob, @@ -3245,7 +3246,7 @@ static void do_vpaint_brush_blur_verts(bContext *C, template static void do_vpaint_brush_smear(bContext *C, - Sculpt *UNUSED(sd), + Sculpt * /*sd*/, VPaint *vp, VPaintData *vpd, Object *ob, @@ -3538,7 +3539,7 @@ static float paint_and_tex_color_alpha(VPaint *vp, template static void vpaint_do_draw(bContext *C, - Sculpt *UNUSED(sd), + Sculpt * /*sd*/, VPaint *vp, VPaintData *vpd, Object *ob, @@ -3883,7 +3884,7 @@ static void vpaint_stroke_update_step_intern(bContext *C, PaintStroke *stroke, P } static void vpaint_stroke_update_step(bContext *C, - wmOperator *UNUSED(op), + wmOperator * /*op*/, PaintStroke *stroke, PointerRNA *itemptr) { @@ -3912,7 +3913,7 @@ static void vpaint_stroke_update_step(bContext *C, } template -static void vpaint_free_vpaintdata(Object *UNUSED(ob), void *_vpd) +static void vpaint_free_vpaintdata(Object * /*ob*/, void *_vpd) { VPaintData *vpd = static_cast *>(_vpd); @@ -4210,7 +4211,7 @@ extern "C" bool BKE_object_attributes_active_color_fill(Object *ob, return paint_object_attributes_active_color_fill_ex(ob, ColorPaint4f(fill_color), only_selected); } -static int vertex_color_set_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_color_set_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); Object *obact = CTX_data_active_object(C); diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc index 2f448dc056b..c2b60f1d2d1 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc @@ -120,7 +120,7 @@ static bool vertex_paint_from_weight(Object *ob) return true; } -static int vertex_paint_from_weight_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_paint_from_weight_exec(bContext *C, wmOperator * /*op*/) { Object *obact = CTX_data_active_object(C); if (vertex_paint_from_weight(obact)) { @@ -217,7 +217,7 @@ static bool vertex_color_smooth(Object *ob) return true; } -static int vertex_color_smooth_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_color_smooth_exec(bContext *C, wmOperator * /*op*/) { Object *obact = CTX_data_active_object(C); if (vertex_color_smooth(obact)) { @@ -419,7 +419,7 @@ void PAINT_OT_vertex_color_hsv(wmOperatorType *ot) RNA_def_float(ot->srna, "v", 1.0f, 0.0f, 2.0f, "Value", "", 0.0f, 2.0f); } -static int vertex_color_invert_exec(bContext *C, wmOperator *UNUSED(op)) +static int vertex_color_invert_exec(bContext *C, wmOperator * /*op*/) { Object *obact = CTX_data_active_object(C); diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.cc b/source/blender/editors/sculpt_paint/sculpt_face_set.cc index fb8d72f02bd..79c1304eee5 100644 --- a/source/blender/editors/sculpt_paint/sculpt_face_set.cc +++ b/source/blender/editors/sculpt_paint/sculpt_face_set.cc @@ -995,7 +995,7 @@ void SCULPT_OT_face_sets_change_visibility(wmOperatorType *ot) ""); } -static int sculpt_face_sets_randomize_colors_exec(bContext *C, wmOperator *UNUSED(op)) +static int sculpt_face_sets_randomize_colors_exec(bContext *C, wmOperator * /*op*/) { Object *ob = CTX_data_active_object(C); diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc index 6dfb01cec20..8d6fbaa5988 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc +++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc @@ -431,7 +431,7 @@ static void push_undo(const NodeData &node_data, static void do_push_undo_tile(void *__restrict userdata, const int n, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { TexturePaintingUserData *data = static_cast(userdata); PBVHNode *node = data->nodes[n]; @@ -460,7 +460,7 @@ static void do_push_undo_tile(void *__restrict userdata, static void do_mark_dirty_regions(void *__restrict userdata, const int n, - const TaskParallelTLS *__restrict UNUSED(tls)) + const TaskParallelTLS *__restrict /*tls*/) { TexturePaintingUserData *data = static_cast(userdata); PBVHNode *node = data->nodes[n]; diff --git a/source/blender/editors/space_file/asset_catalog_tree_view.cc b/source/blender/editors/space_file/asset_catalog_tree_view.cc index 1829f19bfd6..a45dd078401 100644 --- a/source/blender/editors/space_file/asset_catalog_tree_view.cc +++ b/source/blender/editors/space_file/asset_catalog_tree_view.cc @@ -598,7 +598,7 @@ std::string AssetCatalogTreeViewAllItem::DropController::drop_tooltip(const wmDr TIP_("to the top level of the tree"); } -bool AssetCatalogTreeViewAllItem::DropController::on_drop(struct bContext *UNUSED(C), +bool AssetCatalogTreeViewAllItem::DropController::on_drop(struct bContext */*C*/, const wmDrag &drag) { BLI_assert(drag.type == WM_DRAG_ASSET_CATALOG); diff --git a/source/blender/editors/space_file/file_indexer.cc b/source/blender/editors/space_file/file_indexer.cc index 7c2ec1a30fd..ec631eb48b3 100644 --- a/source/blender/editors/space_file/file_indexer.cc +++ b/source/blender/editors/space_file/file_indexer.cc @@ -17,17 +17,17 @@ namespace blender::ed::file::indexer { -static eFileIndexerResult read_index(const char *UNUSED(file_name), - FileIndexerEntries *UNUSED(entries), - int *UNUSED(r_read_entries_len), - void *UNUSED(user_data)) +static eFileIndexerResult read_index(const char * /*file_name*/, + FileIndexerEntries * /*entries*/, + int * /*r_read_entries_len*/, + void * /*user_data*/) { return FILE_INDEXER_NEEDS_UPDATE; } -static void update_index(const char *UNUSED(file_name), - FileIndexerEntries *UNUSED(entries), - void *UNUSED(user_data)) +static void update_index(const char * /*file_name*/, + FileIndexerEntries * /*entries*/, + void * /*user_data*/) { } diff --git a/source/blender/editors/space_file/filelist.cc b/source/blender/editors/space_file/filelist.cc index 1eb67da0347..d72d7cb14d0 100644 --- a/source/blender/editors/space_file/filelist.cc +++ b/source/blender/editors/space_file/filelist.cc @@ -733,7 +733,7 @@ static bool is_filtered_file_type(const FileListInternEntry *file, const FileLis /** \return true when the file should be in the result set, false if it should be filtered out. */ static bool is_filtered_file(FileListInternEntry *file, - const char *UNUSED(root), + const char * /*root*/, FileListFilter *filter) { return is_filtered_file_type(file, filter) && @@ -858,14 +858,14 @@ static bool is_filtered_lib(FileListInternEntry *file, const char *root, FileLis } static bool is_filtered_main(FileListInternEntry *file, - const char *UNUSED(dir), + const char * /*dir*/, FileListFilter *filter) { return !is_filtered_hidden(file->relpath, filter, file); } static bool is_filtered_main_assets(FileListInternEntry *file, - const char *UNUSED(dir), + const char * /*dir*/, FileListFilter *filter) { /* "Filtered" means *not* being filtered out... So return true if the file should be visible. */ @@ -1308,7 +1308,7 @@ static void parent_dir_until_exists_or_default_root(char *dir) } } -static bool filelist_checkdir_dir(struct FileList *UNUSED(filelist), +static bool filelist_checkdir_dir(struct FileList * /*filelist*/, char *r_dir, const bool do_change) { @@ -1319,7 +1319,7 @@ static bool filelist_checkdir_dir(struct FileList *UNUSED(filelist), return BLI_is_dir(r_dir); } -static bool filelist_checkdir_lib(struct FileList *UNUSED(filelist), +static bool filelist_checkdir_lib(struct FileList * /*filelist*/, char *r_dir, const bool do_change) { @@ -1344,9 +1344,9 @@ static bool filelist_checkdir_main(struct FileList *filelist, char *r_dir, const return filelist_checkdir_lib(filelist, r_dir, do_change); } -static bool filelist_checkdir_main_assets(struct FileList *UNUSED(filelist), - char *UNUSED(r_dir), - const bool UNUSED(do_change)) +static bool filelist_checkdir_main_assets(struct FileList * /*filelist*/, + char * /*r_dir*/, + const bool /*do_change*/) { /* Main is always valid. */ return true; @@ -1491,7 +1491,7 @@ static void filelist_cache_preview_runf(TaskPool *__restrict pool, void *taskdat // printf("%s: End (%d)...\n", __func__, threadid); } -static void filelist_cache_preview_freef(TaskPool *__restrict UNUSED(pool), void *taskdata) +static void filelist_cache_preview_freef(TaskPool *__restrict /*pool*/, void *taskdata) { FileListEntryPreviewTaskData *preview_taskdata = static_cast( taskdata); @@ -3641,9 +3641,9 @@ static void filelist_readjob_load_asset_library_data(FileListReadJob *job_params } static void filelist_readjob_main_assets_add_items(FileListReadJob *job_params, - short *UNUSED(stop), + short * /*stop*/, short *do_update, - float *UNUSED(progress)) + float * /*progress*/) { FileList *filelist = job_params->tmp_filelist; /* Use the thread-safe filelist queue. */ diff --git a/source/blender/editors/space_image/image_undo.cc b/source/blender/editors/space_image/image_undo.cc index 8f144264824..1589195d2af 100644 --- a/source/blender/editors/space_image/image_undo.cc +++ b/source/blender/editors/space_image/image_undo.cc @@ -637,7 +637,7 @@ static void uhandle_free_list(ListBase *undo_handles) /** #UndoImageHandle utilities */ static UndoImageBuf *uhandle_lookup_ubuf(UndoImageHandle *uh, - const Image *UNUSED(image), + const Image * /*image*/, const char *ibuf_name) { LISTBASE_FOREACH (UndoImageBuf *, ubuf, &uh->buffers) { @@ -775,7 +775,7 @@ static bool image_undosys_poll(bContext *C) return false; } -static void image_undosys_step_encode_init(struct bContext *UNUSED(C), UndoStep *us_p) +static void image_undosys_step_encode_init(struct bContext * /*C*/, UndoStep *us_p) { ImageUndoStep *us = reinterpret_cast(us_p); /* dummy, memory is cleared anyway. */ @@ -784,9 +784,7 @@ static void image_undosys_step_encode_init(struct bContext *UNUSED(C), UndoStep us->paint_tile_map = MEM_new(__func__); } -static bool image_undosys_step_encode(struct bContext *C, - struct Main *UNUSED(bmain), - UndoStep *us_p) +static bool image_undosys_step_encode(struct bContext *C, struct Main * /*bmain*/, UndoStep *us_p) { /* Encoding is done along the way by adding tiles * to the current 'ImageUndoStep' added by encode_init. 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 diff --git a/source/blender/editors/space_outliner/outliner_collections.cc b/source/blender/editors/space_outliner/outliner_collections.cc index 48e7aa381ef..f76727bff7c 100644 --- a/source/blender/editors/space_outliner/outliner_collections.cc +++ b/source/blender/editors/space_outliner/outliner_collections.cc @@ -755,7 +755,7 @@ void OUTLINER_OT_collection_link(wmOperatorType *ot) /** \name Instance Collection * \{ */ -static int collection_instance_exec(bContext *C, wmOperator *UNUSED(op)) +static int collection_instance_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); @@ -1502,7 +1502,7 @@ static TreeTraversalAction outliner_hide_collect_data_to_edit(TreeElement *te, v return TRAVERSE_CONTINUE; } -static int outliner_hide_exec(bContext *C, wmOperator *UNUSED(op)) +static int outliner_hide_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -1558,7 +1558,7 @@ void OUTLINER_OT_hide(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } -static int outliner_unhide_all_exec(bContext *C, wmOperator *UNUSED(op)) +static int outliner_unhide_all_exec(bContext *C, wmOperator * /*op*/) { Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.cc b/source/blender/editors/space_outliner/outliner_dragdrop.cc index 758928fed8e..20e3eb0009d 100644 --- a/source/blender/editors/space_outliner/outliner_dragdrop.cc +++ b/source/blender/editors/space_outliner/outliner_dragdrop.cc @@ -500,7 +500,7 @@ static bool parent_clear_poll(bContext *C, wmDrag *drag, const wmEvent *event) } } -static int parent_clear_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int parent_clear_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { Main *bmain = CTX_data_main(C); @@ -555,7 +555,7 @@ static bool scene_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event) return (ob && (outliner_ID_drop_find(C, event, ID_SCE) != nullptr)); } -static int scene_drop_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int scene_drop_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { Main *bmain = CTX_data_main(C); Scene *scene = (Scene *)outliner_ID_drop_find(C, event, ID_SCE); @@ -625,7 +625,7 @@ static bool material_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event) return (ma && (outliner_ID_drop_find(C, event, ID_OB) != nullptr)); } -static int material_drop_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int material_drop_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { Main *bmain = CTX_data_main(C); Object *ob = (Object *)outliner_ID_drop_find(C, event, ID_OB); @@ -886,10 +886,10 @@ static bool datastack_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event) return true; } -static char *datastack_drop_tooltip(bContext *UNUSED(C), +static char *datastack_drop_tooltip(bContext * /*C*/, wmDrag *drag, const int UNUSED(xy[2]), - struct wmDropBox *UNUSED(drop)) + struct wmDropBox * /*drop*/) { StackDropData *drop_data = static_cast(drag->poin); switch (drop_data->drop_action) { @@ -1224,7 +1224,7 @@ static bool collection_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event static char *collection_drop_tooltip(bContext *C, wmDrag *drag, const int xy[2], - wmDropBox *UNUSED(drop)) + wmDropBox * /*drop*/) { wmWindow *win = CTX_wm_window(C); const wmEvent *event = win ? win->eventstate : nullptr; @@ -1290,7 +1290,7 @@ static char *collection_drop_tooltip(bContext *C, return nullptr; } -static int collection_drop_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int collection_drop_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); @@ -1404,9 +1404,7 @@ static TreeElement *outliner_item_drag_element_find(SpaceOutliner *space_outline return outliner_find_item_at_y(space_outliner, &space_outliner->tree, my); } -static int outliner_item_drag_drop_invoke(bContext *C, - wmOperator *UNUSED(op), - const wmEvent *event) +static int outliner_item_drag_drop_invoke(bContext *C, wmOperator * /*op*/, const wmEvent *event) { ARegion *region = CTX_wm_region(C); SpaceOutliner *space_outliner = CTX_wm_space_outliner(C); diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index 64aaf00344b..acfbb7a8ae4 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -166,12 +166,12 @@ static void restrictbutton_recursive_bone(Bone *bone_parent, int flag, bool set_ } } -static void restrictbutton_r_lay_fn(bContext *C, void *poin, void *UNUSED(poin2)) +static void restrictbutton_r_lay_fn(bContext *C, void *poin, void * /*poin2*/) { WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, poin); } -static void restrictbutton_bone_visibility_fn(bContext *C, void *poin, void *UNUSED(poin2)) +static void restrictbutton_bone_visibility_fn(bContext *C, void *poin, void * /*poin2*/) { Bone *bone = (Bone *)poin; @@ -180,7 +180,7 @@ static void restrictbutton_bone_visibility_fn(bContext *C, void *poin, void *UNU } } -static void restrictbutton_bone_select_fn(bContext *C, void *UNUSED(poin), void *poin2) +static void restrictbutton_bone_select_fn(bContext *C, void * /*poin*/, void *poin2) { Bone *bone = (Bone *)poin2; if (bone->flag & BONE_UNSELECTABLE) { @@ -226,7 +226,7 @@ static void restrictbutton_ebone_visibility_fn(bContext *C, void *poin, void *po WM_event_add_notifier(C, NC_OBJECT | ND_POSE, nullptr); } -static void restrictbutton_gp_layer_flag_fn(bContext *C, void *poin, void *UNUSED(poin2)) +static void restrictbutton_gp_layer_flag_fn(bContext *C, void *poin, void * /*poin2*/) { ID *id = (ID *)poin; @@ -234,7 +234,7 @@ static void restrictbutton_gp_layer_flag_fn(bContext *C, void *poin, void *UNUSE WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED, nullptr); } -static void restrictbutton_id_user_toggle(bContext *UNUSED(C), void *poin, void *UNUSED(poin2)) +static void restrictbutton_id_user_toggle(bContext * /*C*/, void *poin, void * /*poin2*/) { ID *id = (ID *)poin; @@ -2108,7 +2108,7 @@ static void outliner_buttons(const bContext *C, } } -static void outliner_mode_toggle_fn(bContext *C, void *tselem_poin, void *UNUSED(arg2)) +static void outliner_mode_toggle_fn(bContext *C, void *tselem_poin, void * /*arg2*/) { SpaceOutliner *space_outliner = CTX_wm_space_outliner(C); TreeStoreElem *tselem = (TreeStoreElem *)tselem_poin; diff --git a/source/blender/editors/space_outliner/outliner_edit.cc b/source/blender/editors/space_outliner/outliner_edit.cc index 7a66644b5a8..21d44cb5d58 100644 --- a/source/blender/editors/space_outliner/outliner_edit.cc +++ b/source/blender/editors/space_outliner/outliner_edit.cc @@ -77,7 +77,7 @@ static void outliner_show_active(SpaceOutliner *space_outliner, /** \name Highlight on Cursor Motion Operator * \{ */ -static int outliner_highlight_update(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int outliner_highlight_update(bContext *C, wmOperator * /*op*/, const wmEvent *event) { /* stop highlighting if out of area */ if (!ED_screen_area_active(C)) { @@ -358,11 +358,11 @@ static void do_item_rename(ARegion *region, void item_rename_fn(bContext *C, ReportList *reports, - Scene *UNUSED(scene), + Scene * /*scene*/, TreeElement *te, - TreeStoreElem *UNUSED(tsep), + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { ARegion *region = CTX_wm_region(C); do_item_rename(region, te, tselem, reports); @@ -501,11 +501,11 @@ static void id_delete_tag(bContext *C, ReportList *reports, TreeElement *te, Tre void id_delete_tag_fn(bContext *C, ReportList *reports, - Scene *UNUSED(scene), + Scene * /*scene*/, TreeElement *te, - TreeStoreElem *UNUSED(tsep), + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { id_delete_tag(C, reports, te, tselem); } @@ -681,7 +681,7 @@ static int outliner_id_remap_invoke(bContext *C, wmOperator *op, const wmEvent * static const EnumPropertyItem *outliner_id_itemf(bContext *C, PointerRNA *ptr, - PropertyRNA *UNUSED(prop), + PropertyRNA * /*prop*/, bool *r_free) { if (C == nullptr) { @@ -744,12 +744,12 @@ void OUTLINER_OT_id_remap(wmOperatorType *ot) } void id_remap_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), - TreeStoreElem *UNUSED(tsep), + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { wmOperatorType *ot = WM_operatortype_find("OUTLINER_OT_id_remap", false); PointerRNA op_props; @@ -985,12 +985,12 @@ void OUTLINER_OT_lib_relocate(wmOperatorType *ot) } void lib_relocate_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), + ReportList * /*reports*/, + Scene * /*scene*/, TreeElement *te, - TreeStoreElem *UNUSED(tsep), + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { /* XXX: This does not work with several items * (it is only called once in the end, due to the 'deferred' @@ -1042,12 +1042,12 @@ void OUTLINER_OT_lib_reload(wmOperatorType *ot) } void lib_reload_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), + ReportList * /*reports*/, + Scene * /*scene*/, TreeElement *te, - TreeStoreElem *UNUSED(tsep), + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { wmOperatorType *ot = WM_operatortype_find("WM_OT_lib_reload", false); @@ -1139,7 +1139,7 @@ bool outliner_flag_flip(const ListBase &lb, const short flag) /** \name Toggle Expanded (Outliner) Operator * \{ */ -static int outliner_toggle_expanded_exec(bContext *C, wmOperator *UNUSED(op)) +static int outliner_toggle_expanded_exec(bContext *C, wmOperator * /*op*/) { SpaceOutliner *space_outliner = CTX_wm_space_outliner(C); ARegion *region = CTX_wm_region(C); @@ -1316,7 +1316,7 @@ static void outliner_show_active(SpaceOutliner *space_outliner, } } -static int outliner_show_active_exec(bContext *C, wmOperator *UNUSED(op)) +static int outliner_show_active_exec(bContext *C, wmOperator * /*op*/) { SpaceOutliner *space_outliner = CTX_wm_space_outliner(C); const Scene *scene = CTX_data_scene(C); @@ -1545,7 +1545,7 @@ static void tree_element_show_hierarchy(Scene *scene, SpaceOutliner *space_outli } /* show entire object level hierarchy */ -static int outliner_show_hierarchy_exec(bContext *C, wmOperator *UNUSED(op)) +static int outliner_show_hierarchy_exec(bContext *C, wmOperator * /*op*/) { SpaceOutliner *space_outliner = CTX_wm_space_outliner(C); ARegion *region = CTX_wm_region(C); @@ -1602,7 +1602,7 @@ static void tree_element_to_path(TreeElement *te, char **path, int *array_index, short *flag, - short *UNUSED(groupmode)) + short * /*groupmode*/) { ListBase hierarchy = {nullptr, nullptr}; char *newpath = nullptr; @@ -2057,7 +2057,7 @@ void OUTLINER_OT_keyingset_add_selected(wmOperatorType *ot) /** \name Keying-Set Remove Operator * \{ */ -static int outliner_keyingset_removeitems_exec(bContext *C, wmOperator *UNUSED(op)) +static int outliner_keyingset_removeitems_exec(bContext *C, wmOperator * /*op*/) { SpaceOutliner *space_outliner = CTX_wm_space_outliner(C); Scene *scene = CTX_data_scene(C); @@ -2108,7 +2108,7 @@ static bool ed_operator_outliner_id_orphans_active(bContext *C) return true; } -static int outliner_orphans_purge_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int outliner_orphans_purge_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { Main *bmain = CTX_data_main(C); int num_tagged[INDEX_ID_MAX] = {0}; diff --git a/source/blender/editors/space_outliner/outliner_select.cc b/source/blender/editors/space_outliner/outliner_select.cc index 6f8677e8370..20319a8befe 100644 --- a/source/blender/editors/space_outliner/outliner_select.cc +++ b/source/blender/editors/space_outliner/outliner_select.cc @@ -713,7 +713,7 @@ static void tree_element_sequence_activate(bContext *C, WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER | NA_SELECTED, scene); } -static void tree_element_sequence_dup_activate(Scene *scene, TreeElement *UNUSED(te)) +static void tree_element_sequence_dup_activate(Scene *scene, TreeElement * /*te*/) { Editing *ed = SEQ_editing_get(scene); @@ -2017,7 +2017,7 @@ static void outliner_walk_scroll(SpaceOutliner *space_outliner, ARegion *region, } } -static int outliner_walk_select_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) +static int outliner_walk_select_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { SpaceOutliner *space_outliner = CTX_wm_space_outliner(C); ARegion *region = CTX_wm_region(C); diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc index 69ab9a2950e..2ece9ecc7f2 100644 --- a/source/blender/editors/space_outliner/outliner_tools.cc +++ b/source/blender/editors/space_outliner/outliner_tools.cc @@ -215,25 +215,25 @@ static bool outliner_operation_tree_element_poll(bContext *C) } static void unlink_action_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, TreeStoreElem *tsep, - TreeStoreElem *UNUSED(tselem), - void *UNUSED(user_data)) + TreeStoreElem * /*tselem*/, + void * /*user_data*/) { /* just set action to nullptr */ BKE_animdata_set_action(CTX_wm_reports(C), tsep->id, nullptr); DEG_id_tag_update(tsep->id, ID_RECALC_ANIMATION); } -static void unlink_material_fn(bContext *UNUSED(C), +static void unlink_material_fn(bContext * /*C*/, ReportList *reports, - Scene *UNUSED(scene), + Scene * /*scene*/, TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { const bool te_is_material = TSE_IS_REAL_ID(tselem) && (GS(tselem->id->name) == ID_MA); @@ -315,13 +315,13 @@ static void unlink_material_fn(bContext *UNUSED(C), } } -static void unlink_texture_fn(bContext *UNUSED(C), - ReportList *UNUSED(reports), - Scene *UNUSED(scene), +static void unlink_texture_fn(bContext * /*C*/, + ReportList * /*reports*/, + Scene * /*scene*/, TreeElement *te, TreeStoreElem *tsep, - TreeStoreElem *UNUSED(tselem), - void *UNUSED(user_data)) + TreeStoreElem * /*tselem*/, + void * /*user_data*/) { MTex **mtex = nullptr; int a; @@ -345,12 +345,12 @@ static void unlink_texture_fn(bContext *UNUSED(C), } static void unlink_collection_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, TreeStoreElem *tsep, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { Main *bmain = CTX_data_main(C); Collection *collection = (Collection *)tselem->id; @@ -381,12 +381,12 @@ static void unlink_collection_fn(bContext *C, } static void unlink_object_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), + ReportList * /*reports*/, + Scene * /*scene*/, TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { if (tsep && tsep->id) { Main *bmain = CTX_data_main(C); @@ -419,13 +419,13 @@ static void unlink_object_fn(bContext *C, } } -static void unlink_world_fn(bContext *UNUSED(C), - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), +static void unlink_world_fn(bContext * /*C*/, + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, TreeStoreElem *tsep, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { Scene *parscene = (Scene *)tsep->id; World *wo = (World *)tselem->id; @@ -584,7 +584,7 @@ static bool outliner_do_scene_operation( static bool scene_fn(bContext *C, eOutliner_PropSceneOps event, - TreeElement *UNUSED(te), + TreeElement * /*te*/, TreeStoreElem *tselem) { Scene *scene = (Scene *)tselem->id; @@ -684,11 +684,11 @@ static void merged_element_search_fn_recursive( } /* Get a list of elements that match the search string */ -static void merged_element_search_update_fn(const bContext *UNUSED(C), +static void merged_element_search_update_fn(const bContext * /*C*/, void *data, const char *str, uiSearchItems *items, - const bool UNUSED(is_first)) + const bool /*is_first*/) { MergedSearchData *search_data = (MergedSearchData *)data; TreeElement *parent = search_data->parent_element; @@ -700,7 +700,7 @@ static void merged_element_search_update_fn(const bContext *UNUSED(C), } /* Activate an element from the merged element search menu */ -static void merged_element_search_exec_fn(struct bContext *C, void *UNUSED(arg1), void *element) +static void merged_element_search_exec_fn(struct bContext *C, void * /*arg1*/, void *element) { SpaceOutliner *space_outliner = CTX_wm_space_outliner(C); TreeElement *te = (TreeElement *)element; @@ -775,12 +775,12 @@ void merged_element_search_menu_invoke(bContext *C, } static void object_select_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), - TreeStoreElem *UNUSED(tsep), + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { const Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -800,12 +800,12 @@ static void object_select_fn(bContext *C, * \{ */ static void object_select_hierarchy_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), + ReportList * /*reports*/, + Scene * /*scene*/, TreeElement *te, - TreeStoreElem *UNUSED(tsep), - TreeStoreElem *UNUSED(tselem), - void *UNUSED(user_data)) + TreeStoreElem * /*tsep*/, + TreeStoreElem * /*tselem*/, + void * /*user_data*/) { /* Don't extend because this toggles, which is nice for Ctrl-Click but not for a menu item. * it's especially confusing when multiple items are selected since some toggle on/off. */ @@ -815,12 +815,12 @@ static void object_select_hierarchy_fn(bContext *C, } static void object_deselect_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), - TreeStoreElem *UNUSED(tsep), + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { const Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -862,12 +862,12 @@ static void outliner_object_delete_fn(bContext *C, ReportList *reports, Scene *s } static void id_local_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), - TreeStoreElem *UNUSED(tsep), + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { if (ID_IS_LINKED(tselem->id) && (tselem->id->tag & LIB_TAG_EXTERN)) { Main *bmain = CTX_data_main(C); @@ -960,7 +960,7 @@ struct OutlinerLibOverrideData { * hierarchy. */ static void id_override_library_create_hierarchy_pre_process_fn(bContext *C, ReportList *reports, - Scene *UNUSED(scene), + Scene * /*scene*/, TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *tselem, @@ -1267,10 +1267,10 @@ static void id_override_library_create_hierarchy_process(bContext *C, } static void id_override_library_reset_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), - TreeStoreElem *UNUSED(tsep), + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, void *user_data) { @@ -1297,10 +1297,10 @@ static void id_override_library_reset_fn(bContext *C, static void id_override_library_clear_single_fn(bContext *C, ReportList *reports, Scene *scene, - TreeElement *UNUSED(te), - TreeStoreElem *UNUSED(tsep), + TreeElement * /*te*/, + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { BLI_assert(TSE_IS_REAL_ID(tselem)); Main *bmain = CTX_data_main(C); @@ -1344,11 +1344,11 @@ static void id_override_library_clear_single_fn(bContext *C, DEG_id_tag_update(&scene->id, ID_RECALC_BASE_FLAGS | ID_RECALC_COPY_ON_WRITE); } -static void id_override_library_resync_fn(bContext *UNUSED(C), - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), - TreeStoreElem *UNUSED(tsep), +static void id_override_library_resync_fn(bContext * /*C*/, + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, void *user_data) { @@ -1393,11 +1393,11 @@ static void id_override_library_resync_hierarchy_process(bContext *C, WM_event_add_notifier(C, NC_WINDOW, nullptr); } -static void id_override_library_delete_hierarchy_fn(bContext *UNUSED(C), - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), - TreeStoreElem *UNUSED(tsep), +static void id_override_library_delete_hierarchy_fn(bContext * /*C*/, + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, void *user_data) { @@ -1420,7 +1420,7 @@ static void id_override_library_delete_hierarchy_fn(bContext *UNUSED(C), /* Clear (delete) a hierarchy of library overrides. */ static void id_override_library_delete_hierarchy_process(bContext *C, - ReportList *UNUSED(reports), + ReportList * /*reports*/, OutlinerLibOverrideData &data) { Main *bmain = CTX_data_main(C); @@ -1430,26 +1430,26 @@ static void id_override_library_delete_hierarchy_process(bContext *C, } } -static void id_fake_user_set_fn(bContext *UNUSED(C), - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), - TreeStoreElem *UNUSED(tsep), +static void id_fake_user_set_fn(bContext * /*C*/, + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { ID *id = tselem->id; id_fake_user_set(id); } -static void id_fake_user_clear_fn(bContext *UNUSED(C), - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), - TreeStoreElem *UNUSED(tsep), +static void id_fake_user_clear_fn(bContext * /*C*/, + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { ID *id = tselem->id; @@ -1457,12 +1457,12 @@ static void id_fake_user_clear_fn(bContext *UNUSED(C), } static void id_select_linked_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), - TreeStoreElem *UNUSED(tsep), + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, + TreeStoreElem * /*tsep*/, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { ID *id = tselem->id; @@ -1470,12 +1470,12 @@ static void id_select_linked_fn(bContext *C, } static void singleuser_action_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), + ReportList * /*reports*/, + Scene * /*scene*/, TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { /* This callback runs for all selected elements, some of which may not be actions which results * in a crash. */ @@ -1498,12 +1498,12 @@ static void singleuser_action_fn(bContext *C, } static void singleuser_world_fn(bContext *C, - ReportList *UNUSED(reports), - Scene *UNUSED(scene), - TreeElement *UNUSED(te), + ReportList * /*reports*/, + Scene * /*scene*/, + TreeElement * /*te*/, TreeStoreElem *tsep, TreeStoreElem *tselem, - void *UNUSED(user_data)) + void * /*user_data*/) { ID *id = tselem->id; @@ -1579,29 +1579,29 @@ void outliner_do_object_operation(bContext *C, /** \name Internal Tagging Utilities * \{ */ -static void clear_animdata_fn(int UNUSED(event), - TreeElement *UNUSED(te), +static void clear_animdata_fn(int /*event*/, + TreeElement * /*te*/, TreeStoreElem *tselem, - void *UNUSED(arg)) + void * /*arg*/) { BKE_animdata_free(tselem->id, true); DEG_id_tag_update(tselem->id, ID_RECALC_ANIMATION); } -static void unlinkact_animdata_fn(int UNUSED(event), - TreeElement *UNUSED(te), +static void unlinkact_animdata_fn(int /*event*/, + TreeElement * /*te*/, TreeStoreElem *tselem, - void *UNUSED(arg)) + void * /*arg*/) { /* just set action to nullptr */ BKE_animdata_set_action(nullptr, tselem->id, nullptr); DEG_id_tag_update(tselem->id, ID_RECALC_ANIMATION); } -static void cleardrivers_animdata_fn(int UNUSED(event), - TreeElement *UNUSED(te), +static void cleardrivers_animdata_fn(int /*event*/, + TreeElement * /*te*/, TreeStoreElem *tselem, - void *UNUSED(arg)) + void * /*arg*/) { IdAdtTemplate *iat = (IdAdtTemplate *)tselem->id; @@ -1610,10 +1610,10 @@ static void cleardrivers_animdata_fn(int UNUSED(event), DEG_id_tag_update(tselem->id, ID_RECALC_ANIMATION); } -static void refreshdrivers_animdata_fn(int UNUSED(event), - TreeElement *UNUSED(te), +static void refreshdrivers_animdata_fn(int /*event*/, + TreeElement * /*te*/, TreeStoreElem *tselem, - void *UNUSED(arg)) + void * /*arg*/) { IdAdtTemplate *iat = (IdAdtTemplate *)tselem->id; @@ -1895,7 +1895,7 @@ enum eOutliner_PropModifierOps { OL_MODIFIER_OP_DELETE, }; -static void pchan_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), void *UNUSED(arg)) +static void pchan_fn(int event, TreeElement *te, TreeStoreElem * /*tselem*/, void * /*arg*/) { bPoseChannel *pchan = (bPoseChannel *)te->directdata; @@ -1914,7 +1914,7 @@ static void pchan_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), } } -static void bone_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), void *UNUSED(arg)) +static void bone_fn(int event, TreeElement *te, TreeStoreElem * /*tselem*/, void * /*arg*/) { Bone *bone = (Bone *)te->directdata; @@ -1933,7 +1933,7 @@ static void bone_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), v } } -static void ebone_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), void *UNUSED(arg)) +static void ebone_fn(int event, TreeElement *te, TreeStoreElem * /*tselem*/, void * /*arg*/) { EditBone *ebone = (EditBone *)te->directdata; @@ -1952,7 +1952,7 @@ static void ebone_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), } } -static void sequence_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), void *scene_ptr) +static void sequence_fn(int event, TreeElement *te, TreeStoreElem * /*tselem*/, void *scene_ptr) { TreeElementSequence *te_seq = tree_element_cast(te); Sequence *seq = &te_seq->getSequence(); @@ -1982,8 +1982,8 @@ static void sequence_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem static void gpencil_layer_fn(int event, TreeElement *te, - TreeStoreElem *UNUSED(tselem), - void *UNUSED(arg)) + TreeStoreElem * /*tselem*/, + void * /*arg*/) { bGPDlayer *gpl = (bGPDlayer *)te->directdata; @@ -2003,7 +2003,7 @@ static void gpencil_layer_fn(int event, static void data_select_linked_fn(int event, TreeElement *te, - TreeStoreElem *UNUSED(tselem), + TreeStoreElem * /*tselem*/, void *C_v) { const TreeElementRNAStruct *te_rna_struct = tree_element_cast(te); @@ -2022,7 +2022,7 @@ static void data_select_linked_fn(int event, } } -static void constraint_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), void *C_v) +static void constraint_fn(int event, TreeElement *te, TreeStoreElem * /*tselem*/, void *C_v) { bContext *C = static_cast(C_v); Main *bmain = CTX_data_main(C); @@ -2062,7 +2062,7 @@ static void constraint_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tsel } } -static void modifier_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem), void *Carg) +static void modifier_fn(int event, TreeElement *te, TreeStoreElem * /*tselem*/, void *Carg) { bContext *C = (bContext *)Carg; Main *bmain = CTX_data_main(C); @@ -2523,8 +2523,8 @@ static const EnumPropertyItem prop_id_op_types[] = { }; static bool outliner_id_operation_item_poll(bContext *C, - PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), + PointerRNA * /*ptr*/, + PropertyRNA * /*prop*/, const int enum_value) { if (!outliner_operation_tree_element_poll(C)) { @@ -2891,7 +2891,7 @@ static void outliner_do_id_set_operation( }); } -static void actionset_id_fn(TreeElement *UNUSED(te), +static void actionset_id_fn(TreeElement * /*te*/, TreeStoreElem *tselem, TreeStoreElem *tsep, ID *actId) @@ -3274,9 +3274,9 @@ static int outliner_data_operation_exec(bContext *C, wmOperator *op) /* Dynamically populate an enum of Keying Sets */ static const EnumPropertyItem *outliner_data_op_sets_enum_item_fn(bContext *C, - PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), - bool *UNUSED(r_free)) + PointerRNA * /*ptr*/, + PropertyRNA * /*prop*/, + bool * /*r_free*/) { /* Check for invalid states. */ if (C == nullptr) { @@ -3433,7 +3433,7 @@ static int do_outliner_operation_event(bContext *C, return OPERATOR_CANCELLED; } -static int outliner_operation(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) +static int outliner_operation(bContext *C, wmOperator * /*op*/, const wmEvent *event) { ARegion *region = CTX_wm_region(C); SpaceOutliner *space_outliner = CTX_wm_space_outliner(C); diff --git a/source/blender/editors/space_outliner/space_outliner.cc b/source/blender/editors/space_outliner/space_outliner.cc index e20bc0a956a..af2da7fa872 100644 --- a/source/blender/editors/space_outliner/space_outliner.cc +++ b/source/blender/editors/space_outliner/space_outliner.cc @@ -92,7 +92,7 @@ static void outliner_main_region_draw(const bContext *C, ARegion *region) UI_view2d_scrollers_draw(v2d, nullptr); } -static void outliner_main_region_free(ARegion *UNUSED(region)) +static void outliner_main_region_free(ARegion * /*region*/) { } @@ -285,7 +285,7 @@ static void outliner_main_region_message_subscribe(const wmRegionMessageSubscrib /* ************************ header outliner area region *********************** */ /* add handlers, stuff you only do once or on area/region changes */ -static void outliner_header_region_init(wmWindowManager *UNUSED(wm), ARegion *region) +static void outliner_header_region_init(wmWindowManager * /*wm*/, ARegion *region) { ED_region_header_init(region); } @@ -295,7 +295,7 @@ static void outliner_header_region_draw(const bContext *C, ARegion *region) ED_region_header(C, region); } -static void outliner_header_region_free(ARegion *UNUSED(region)) +static void outliner_header_region_free(ARegion * /*region*/) { } @@ -321,7 +321,7 @@ static void outliner_header_region_listener(const wmRegionListenerParams *params /* ******************** default callbacks for outliner space ***************** */ -static SpaceLink *outliner_create(const ScrArea *UNUSED(area), const Scene *UNUSED(scene)) +static SpaceLink *outliner_create(const ScrArea * /*area*/, const Scene * /*scene*/) { ARegion *region; SpaceOutliner *space_outliner; @@ -365,7 +365,7 @@ static void outliner_free(SpaceLink *sl) } /* spacetype; init callback */ -static void outliner_init(wmWindowManager *UNUSED(wm), ScrArea *area) +static void outliner_init(wmWindowManager * /*wm*/, ScrArea *area) { SpaceOutliner *space_outliner = static_cast(area->spacedata.first); @@ -477,7 +477,7 @@ static void outliner_blend_read_data(BlendDataReader *reader, SpaceLink *sl) space_outliner->runtime = nullptr; } -static void outliner_blend_read_lib(BlendLibReader *reader, ID *UNUSED(parent_id), SpaceLink *sl) +static void outliner_blend_read_lib(BlendLibReader *reader, ID * /*parent_id*/, SpaceLink *sl) { SpaceOutliner *space_outliner = (SpaceOutliner *)sl; diff --git a/source/blender/editors/space_outliner/tree/tree_element_rna.cc b/source/blender/editors/space_outliner/tree/tree_element_rna.cc index 9e1f22b49d6..6e92fa087fb 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_rna.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_rna.cc @@ -52,7 +52,7 @@ bool TreeElementRNACommon::isRNAValid() const return rna_ptr_.data != nullptr; } -bool TreeElementRNACommon::expandPoll(const SpaceOutliner &UNUSED(space_outliner)) const +bool TreeElementRNACommon::expandPoll(const SpaceOutliner & /*space_outliner*/) const { return isRNAValid(); } diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc index ee43519e260..b094222b16e 100644 --- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc +++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc @@ -45,7 +45,7 @@ using namespace blender; using namespace blender::ed::spreadsheet; -static SpaceLink *spreadsheet_create(const ScrArea *UNUSED(area), const Scene *UNUSED(scene)) +static SpaceLink *spreadsheet_create(const ScrArea * /*area*/, const Scene * /*scene*/) { SpaceSpreadsheet *spreadsheet_space = MEM_cnew("spreadsheet space"); spreadsheet_space->spacetype = SPACE_SPREADSHEET; @@ -110,7 +110,7 @@ static void spreadsheet_free(SpaceLink *sl) BKE_viewer_path_clear(&sspreadsheet->viewer_path); } -static void spreadsheet_init(wmWindowManager *UNUSED(wm), ScrArea *area) +static void spreadsheet_init(wmWindowManager * /*wm*/, ScrArea *area) { SpaceSpreadsheet *sspreadsheet = (SpaceSpreadsheet *)area->spacedata.first; if (sspreadsheet->runtime == nullptr) { @@ -152,9 +152,7 @@ static void spreadsheet_keymap(wmKeyConfig *keyconf) WM_keymap_ensure(keyconf, "Spreadsheet Generic", SPACE_SPREADSHEET, 0); } -static void spreadsheet_id_remap(ScrArea *UNUSED(area), - SpaceLink *slink, - const IDRemapper *mappings) +static void spreadsheet_id_remap(ScrArea * /*area*/, SpaceLink *slink, const IDRemapper *mappings) { SpaceSpreadsheet *sspreadsheet = (SpaceSpreadsheet *)slink; BKE_viewer_path_id_remap(&sspreadsheet->viewer_path, mappings); @@ -510,7 +508,7 @@ static void spreadsheet_main_region_listener(const wmRegionListenerParams *param } } -static void spreadsheet_header_region_init(wmWindowManager *UNUSED(wm), ARegion *region) +static void spreadsheet_header_region_init(wmWindowManager * /*wm*/, ARegion *region) { ED_region_header_init(region); } @@ -521,7 +519,7 @@ static void spreadsheet_header_region_draw(const bContext *C, ARegion *region) ED_region_header(C, region); } -static void spreadsheet_header_region_free(ARegion *UNUSED(region)) +static void spreadsheet_header_region_free(ARegion * /*region*/) { } @@ -565,7 +563,7 @@ static void spreadsheet_header_region_listener(const wmRegionListenerParams *par } } -static void spreadsheet_footer_region_init(wmWindowManager *UNUSED(wm), ARegion *region) +static void spreadsheet_footer_region_init(wmWindowManager * /*wm*/, ARegion *region) { ED_region_header_init(region); } @@ -608,11 +606,11 @@ static void spreadsheet_footer_region_draw(const bContext *C, ARegion *region) UI_block_draw(C, block); } -static void spreadsheet_footer_region_free(ARegion *UNUSED(region)) +static void spreadsheet_footer_region_free(ARegion * /*region*/) { } -static void spreadsheet_footer_region_listener(const wmRegionListenerParams *UNUSED(params)) +static void spreadsheet_footer_region_listener(const wmRegionListenerParams * /*params*/) { } @@ -654,11 +652,11 @@ static void spreadsheet_sidebar_init(wmWindowManager *wm, ARegion *region) WM_event_add_keymap_handler(®ion->handlers, keymap); } -static void spreadsheet_right_region_free(ARegion *UNUSED(region)) +static void spreadsheet_right_region_free(ARegion * /*region*/) { } -static void spreadsheet_right_region_listener(const wmRegionListenerParams *UNUSED(params)) +static void spreadsheet_right_region_listener(const wmRegionListenerParams * /*params*/) { } diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc b/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc index e1f13f05715..e50e655853f 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc @@ -26,23 +26,23 @@ SpreadsheetDrawer::SpreadsheetDrawer() SpreadsheetDrawer::~SpreadsheetDrawer() = default; -void SpreadsheetDrawer::draw_top_row_cell(int UNUSED(column_index), - const CellDrawParams &UNUSED(params)) const +void SpreadsheetDrawer::draw_top_row_cell(int /*column_index*/, + const CellDrawParams & /*params*/) const { } -void SpreadsheetDrawer::draw_left_column_cell(int UNUSED(row_index), - const CellDrawParams &UNUSED(params)) const +void SpreadsheetDrawer::draw_left_column_cell(int /*row_index*/, + const CellDrawParams & /*params*/) const { } -void SpreadsheetDrawer::draw_content_cell(int UNUSED(row_index), - int UNUSED(column_index), - const CellDrawParams &UNUSED(params)) const +void SpreadsheetDrawer::draw_content_cell(int /*row_index*/, + int /*column_index*/, + const CellDrawParams & /*params*/) const { } -int SpreadsheetDrawer::column_width(int UNUSED(column_index)) const +int SpreadsheetDrawer::column_width(int /*column_index*/) const { return 5 * UI_UNIT_X; } diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc index 7e6b0ab18c3..b4b8417c172 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc @@ -342,7 +342,7 @@ class SpreadsheetLayoutDrawer : public SpreadsheetDrawer { /* Tooltip showing raw byte values. Encode values in pointer to avoid memory allocation. */ UI_but_func_tooltip_set( but, - [](bContext * /*C*/, void *argN, const char *UNUSED(tip)) { + [](bContext * /*C*/, void *argN, const char * /*tip*/) { const uint32_t uint_color = POINTER_AS_UINT(argN); ColorGeometry4b color = *(ColorGeometry4b *)&uint_color; return BLI_sprintfN(TIP_("Byte Color (sRGB encoded):\n%3d %3d %3d %3d"), diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc b/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc index 166c5de9fc3..baa58a7d824 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc @@ -22,7 +22,7 @@ using namespace blender::ed::spreadsheet; -static int row_filter_add_exec(bContext *C, wmOperator *UNUSED(op)) +static int row_filter_add_exec(bContext *C, wmOperator * /*op*/) { SpaceSpreadsheet *sspreadsheet = CTX_wm_space_spreadsheet(C); @@ -78,9 +78,7 @@ static void SPREADSHEET_OT_remove_row_filter_rule(wmOperatorType *ot) RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "", 0, INT_MAX); } -static int select_component_domain_invoke(bContext *C, - wmOperator *op, - const wmEvent *UNUSED(event)) +static int select_component_domain_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { GeometryComponentType component_type = static_cast( RNA_int_get(op->ptr, "component_type")); diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc index a1f6de56bb2..fa22da4f26a 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc @@ -30,7 +30,7 @@ using namespace blender; using namespace blender::ed::spreadsheet; -static void filter_panel_id_fn(void *UNUSED(row_filter_v), char *r_name) +static void filter_panel_id_fn(void * /*row_filter_v*/, char *r_name) { /* All row filters use the same panel ID. */ BLI_snprintf(r_name, BKE_ST_MAXNAME, "SPREADSHEET_PT_filter"); @@ -304,7 +304,7 @@ static void filter_reorder(bContext *C, Panel *panel, int new_index) BLI_listbase_link_move(row_filters, filter, new_index - current_index); } -static short get_filter_expand_flag(const bContext *UNUSED(C), Panel *panel) +static short get_filter_expand_flag(const bContext * /*C*/, Panel *panel) { PointerRNA *filter_ptr = UI_panel_custom_data_get(panel); SpreadsheetRowFilter *filter = (SpreadsheetRowFilter *)filter_ptr->data; @@ -312,7 +312,7 @@ static short get_filter_expand_flag(const bContext *UNUSED(C), Panel *panel) return short(filter->flag) & SPREADSHEET_ROW_FILTER_UI_EXPAND; } -static void set_filter_expand_flag(const bContext *UNUSED(C), Panel *panel, short expand_flag) +static void set_filter_expand_flag(const bContext * /*C*/, Panel *panel, short expand_flag) { PointerRNA *filter_ptr = UI_panel_custom_data_get(panel); SpreadsheetRowFilter *filter = (SpreadsheetRowFilter *)filter_ptr->data; diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index 345958d86ec..672922ac3e5 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -246,7 +246,7 @@ void ED_view3d_shade_update(Main *bmain, View3D *v3d, ScrArea *area) /* ******************** default callbacks for view3d space ***************** */ -static SpaceLink *view3d_create(const ScrArea *UNUSED(area), const Scene *scene) +static SpaceLink *view3d_create(const ScrArea * /*area*/, const Scene *scene) { ARegion *region; View3D *v3d; @@ -329,11 +329,11 @@ static void view3d_free(SpaceLink *sl) } /* spacetype; init callback */ -static void view3d_init(wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) +static void view3d_init(wmWindowManager * /*wm*/, ScrArea * /*area*/) { } -static void view3d_exit(wmWindowManager *UNUSED(wm), ScrArea *area) +static void view3d_exit(wmWindowManager * /*wm*/, ScrArea *area) { BLI_assert(area->spacetype == SPACE_VIEW3D); View3D *v3d = static_cast(area->spacedata.first); @@ -540,7 +540,7 @@ static void view3d_ob_drop_draw_activate(struct wmDropBox *drop, wmDrag *drag) } } -static void view3d_ob_drop_draw_deactivate(struct wmDropBox *drop, wmDrag *UNUSED(drag)) +static void view3d_ob_drop_draw_deactivate(struct wmDropBox *drop, wmDrag * /*drag*/) { V3DSnapCursorState *state = static_cast(drop->draw_data); if (state) { @@ -604,7 +604,7 @@ static bool view3d_mat_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event static char *view3d_mat_drop_tooltip(bContext *C, wmDrag *drag, const int xy[2], - wmDropBox *UNUSED(drop)) + wmDropBox * /*drop*/) { const char *name = WM_drag_get_item_name(drag); ARegion *region = CTX_wm_region(C); @@ -629,10 +629,10 @@ static bool view3d_object_data_drop_poll(bContext *C, wmDrag *drag, const wmEven return false; } -static char *view3d_object_data_drop_tooltip(bContext *UNUSED(C), - wmDrag *UNUSED(drag), +static char *view3d_object_data_drop_tooltip(bContext * /*C*/, + wmDrag * /*drag*/, const int UNUSED(xy[2]), - wmDropBox *UNUSED(drop)) + wmDropBox * /*drop*/) { return BLI_strdup(TIP_("Create object instance from object-data")); } @@ -694,9 +694,7 @@ static bool view3d_ima_empty_drop_poll(bContext *C, wmDrag *drag, const wmEvent return false; } -static bool view3d_volume_drop_poll(bContext *UNUSED(C), - wmDrag *drag, - const wmEvent *UNUSED(event)) +static bool view3d_volume_drop_poll(bContext * /*C*/, wmDrag *drag, const wmEvent * /*event*/) { return (drag->type == WM_DRAG_PATH) && (drag->icon == ICON_FILE_VOLUME); } @@ -725,7 +723,7 @@ static void view3d_ob_drop_matrix_from_snap(V3DSnapCursorState *snap_state, } } -static void view3d_ob_drop_copy_local_id(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void view3d_ob_drop_copy_local_id(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { ID *id = WM_drag_get_local_ID(drag, ID_OB); @@ -743,7 +741,7 @@ static void view3d_ob_drop_copy_local_id(bContext *UNUSED(C), wmDrag *drag, wmDr /* Mostly the same logic as #view3d_collection_drop_copy_external_asset(), just different enough to * make sharing code a bit difficult. */ -static void view3d_ob_drop_copy_external_asset(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void view3d_ob_drop_copy_external_asset(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { /* NOTE(@campbellbarton): Selection is handled here, de-selecting objects before append, * using auto-select to ensure the new objects are selected. @@ -785,9 +783,7 @@ static void view3d_ob_drop_copy_external_asset(bContext *UNUSED(C), wmDrag *drag } } -static void view3d_collection_drop_copy_local_id(bContext *UNUSED(C), - wmDrag *drag, - wmDropBox *drop) +static void view3d_collection_drop_copy_local_id(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { ID *id = WM_drag_get_local_ID(drag, ID_GR); RNA_int_set(drop->ptr, "session_uuid", int(id->session_uuid)); @@ -795,7 +791,7 @@ static void view3d_collection_drop_copy_local_id(bContext *UNUSED(C), /* Mostly the same logic as #view3d_ob_drop_copy_external_asset(), just different enough to make * sharing code a bit difficult. */ -static void view3d_collection_drop_copy_external_asset(bContext *UNUSED(C), +static void view3d_collection_drop_copy_external_asset(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { @@ -834,14 +830,14 @@ static void view3d_collection_drop_copy_external_asset(bContext *UNUSED(C), ED_undo_push(C, "Collection_Drop"); } -static void view3d_id_drop_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void view3d_id_drop_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { ID *id = WM_drag_get_local_ID_or_import_from_asset(drag, 0); WM_operator_properties_id_lookup_set_from_id(drop->ptr, id); } -static void view3d_id_drop_copy_with_type(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void view3d_id_drop_copy_with_type(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { ID *id = WM_drag_get_local_ID_or_import_from_asset(drag, 0); @@ -849,7 +845,7 @@ static void view3d_id_drop_copy_with_type(bContext *UNUSED(C), wmDrag *drag, wmD WM_operator_properties_id_lookup_set_from_id(drop->ptr, id); } -static void view3d_id_path_drop_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) +static void view3d_id_path_drop_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) { ID *id = WM_drag_get_local_ID_or_import_from_asset(drag, 0); @@ -1339,7 +1335,7 @@ static void view3d_main_region_listener(const wmRegionListenerParams *params) } static void view3d_do_msg_notify_workbench_view_update(struct bContext *C, - struct wmMsgSubscribeKey *UNUSED(msg_key), + struct wmMsgSubscribeKey * /*msg_key*/, struct wmMsgSubscribeValue *msg_val) { Scene *scene = CTX_data_scene(C); diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc index 57c104455cd..ab77cf3407a 100644 --- a/source/blender/editors/space_view3d/view3d_draw.cc +++ b/source/blender/editors/space_view3d/view3d_draw.cc @@ -1144,7 +1144,7 @@ static void view3d_draw_border(const bContext *C, ARegion *region) /** * Draw Info */ -static void view3d_draw_grease_pencil(const bContext *UNUSED(C)) +static void view3d_draw_grease_pencil(const bContext * /*C*/) { /* TODO: viewport. */ } @@ -2406,7 +2406,7 @@ void ED_view3d_depths_free(ViewDepths *depths) * \{ */ void ED_view3d_datamask(const bContext *C, - const Scene *UNUSED(scene), + const Scene * /*scene*/, const View3D *v3d, CustomData_MeshMasks *r_cddata_masks) { diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc index 83d1ed5f552..c61eac3c777 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc @@ -277,9 +277,9 @@ static void gizmo_preselect_elem_free(wmGizmo *gz) MEM_SAFE_FREE(gz_ele->bases); } -static int gizmo_preselect_elem_invoke(bContext *UNUSED(C), - wmGizmo *UNUSED(gz), - const wmEvent *UNUSED(event)) +static int gizmo_preselect_elem_invoke(bContext * /*C*/, + wmGizmo * /*gz*/, + const wmEvent * /*event*/) { return OPERATOR_PASS_THROUGH; } @@ -447,9 +447,9 @@ static void gizmo_preselect_edgering_free(wmGizmo *gz) MEM_SAFE_FREE(gz_ring->bases); } -static int gizmo_preselect_edgering_invoke(bContext *UNUSED(C), - wmGizmo *UNUSED(gz), - const wmEvent *UNUSED(event)) +static int gizmo_preselect_edgering_invoke(bContext * /*C*/, + wmGizmo * /*gz*/, + const wmEvent * /*event*/) { return OPERATOR_PASS_THROUGH; } diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index 0e266f5eae2..5e9720d119e 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -696,7 +696,7 @@ static bool do_lasso_select_pose(ViewContext *vc, static void do_lasso_select_mesh__doSelectVert(void *userData, BMVert *eve, const float screen_co[2], - int UNUSED(index)) + int /*index*/) { LassoSelectUserData *data = static_cast(userData); const bool is_select = BM_elem_flag_test(eve, BM_ELEM_SELECT); @@ -775,7 +775,7 @@ static void do_lasso_select_mesh__doSelectEdge_pass1(void *user_data, static void do_lasso_select_mesh__doSelectFace(void *userData, BMFace *efa, const float screen_co[2], - int UNUSED(index)) + int /*index*/) { LassoSelectUserData *data = static_cast(userData); const bool is_select = BM_elem_flag_test(efa, BM_ELEM_SELECT); @@ -883,7 +883,7 @@ static bool do_lasso_select_mesh(ViewContext *vc, } static void do_lasso_select_curve__doSelect(void *userData, - Nurb *UNUSED(nu), + Nurb * /*nu*/, BPoint *bp, BezTriple *bezt, int beztindex, @@ -1443,8 +1443,8 @@ static SelMenuItemF object_mouse_select_menu_data[SEL_MENU_SIZE]; /* special (crappy) operator only for menu select */ static const EnumPropertyItem *object_select_menu_enum_itemf(bContext *C, - PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), + PointerRNA * /*ptr*/, + PropertyRNA * /*prop*/, bool *r_free) { EnumPropertyItem *item = nullptr, item_tmp = {0}; @@ -1917,7 +1917,7 @@ static bool selectbuffer_has_bones(const GPUSelectResult *buffer, const uint hit } /* utility function for mixed_bones_object_selectbuffer */ -static int selectbuffer_ret_hits_15(GPUSelectResult *UNUSED(buffer), const int hits15) +static int selectbuffer_ret_hits_15(GPUSelectResult * /*buffer*/, const int hits15) { return hits15; } @@ -3262,7 +3262,7 @@ static bool do_paintface_box_select(ViewContext *vc, } static void do_nurbs_box_select__doSelect(void *userData, - Nurb *UNUSED(nu), + Nurb * /*nu*/, BPoint *bp, BezTriple *bezt, int beztindex, @@ -3362,7 +3362,7 @@ static bool do_lattice_box_select(ViewContext *vc, rcti *rect, const eSelectOp s static void do_mesh_box_select__doSelectVert(void *userData, BMVert *eve, const float screen_co[2], - int UNUSED(index)) + int /*index*/) { BoxSelectUserData *data = static_cast(userData); const bool is_select = BM_elem_flag_test(eve, BM_ELEM_SELECT); @@ -3429,7 +3429,7 @@ static void do_mesh_box_select__doSelectEdge_pass1( static void do_mesh_box_select__doSelectFace(void *userData, BMFace *efa, const float screen_co[2], - int UNUSED(index)) + int /*index*/) { BoxSelectUserData *data = static_cast(userData); const bool is_select = BM_elem_flag_test(efa, BM_ELEM_SELECT); @@ -3997,7 +3997,7 @@ static void view3d_userdata_circleselect_init(CircleSelectUserData *r_data, static void mesh_circle_doSelectVert(void *userData, BMVert *eve, const float screen_co[2], - int UNUSED(index)) + int /*index*/) { CircleSelectUserData *data = static_cast(userData); @@ -4010,7 +4010,7 @@ static void mesh_circle_doSelectEdge(void *userData, BMEdge *eed, const float screen_co_a[2], const float screen_co_b[2], - int UNUSED(index)) + int /*index*/) { CircleSelectUserData *data = static_cast(userData); @@ -4022,7 +4022,7 @@ static void mesh_circle_doSelectEdge(void *userData, static void mesh_circle_doSelectFace(void *userData, BMFace *efa, const float screen_co[2], - int UNUSED(index)) + int /*index*/) { CircleSelectUserData *data = static_cast(userData); @@ -4243,11 +4243,11 @@ static bool paint_vertsel_circle_select(ViewContext *vc, } static void nurbscurve_circle_doSelect(void *userData, - Nurb *UNUSED(nu), + Nurb * /*nu*/, BPoint *bp, BezTriple *bezt, int beztindex, - bool UNUSED(handles_visible), + bool /*handles_visible*/, const float screen_co[2]) { CircleSelectUserData *data = static_cast(userData); diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc index 2f77009e720..90a13722b63 100644 --- a/source/blender/editors/transform/transform_snap_object.cc +++ b/source/blender/editors/transform/transform_snap_object.cc @@ -1244,7 +1244,7 @@ static void nearest_world_tree_co(BVHTree *tree, } } -static bool nearest_world_tree(SnapObjectContext *UNUSED(sctx), +static bool nearest_world_tree(SnapObjectContext * /*sctx*/, const struct SnapObjectParams *params, BVHTree *tree, BVHTree_NearestPointCallback nearest_cb, @@ -2200,7 +2200,7 @@ static eSnapMode snapArmature(SnapObjectContext *sctx, float *dist_px, /* return args */ float r_loc[3], - float *UNUSED(r_no), + float * /*r_no*/, int *r_index) { eSnapMode retval = SCE_SNAP_MODE_NONE; @@ -2367,7 +2367,7 @@ static eSnapMode snapCurve(SnapObjectContext *sctx, float *dist_px, /* return args */ float r_loc[3], - float *UNUSED(r_no), + float * /*r_no*/, int *r_index) { bool has_snap = false; @@ -2537,7 +2537,7 @@ static eSnapMode snap_object_center(const SnapObjectContext *sctx, float *dist_px, /* return args */ float r_loc[3], - float *UNUSED(r_no), + float * /*r_no*/, int *r_index) { eSnapMode retval = SCE_SNAP_MODE_NONE; diff --git a/source/blender/editors/util/ed_util_ops.cc b/source/blender/editors/util/ed_util_ops.cc index d25179a1b70..18d47af7854 100644 --- a/source/blender/editors/util/ed_util_ops.cc +++ b/source/blender/editors/util/ed_util_ops.cc @@ -125,7 +125,7 @@ static bool lib_id_generate_preview_poll(bContext *C) return true; } -static int lib_id_generate_preview_exec(bContext *C, wmOperator *UNUSED(op)) +static int lib_id_generate_preview_exec(bContext *C, wmOperator * /*op*/) { PointerRNA idptr = CTX_data_pointer_get(C, "id"); ID *id = (ID *)idptr.data; @@ -170,7 +170,7 @@ static bool lib_id_generate_preview_from_object_poll(bContext *C) return true; } -static int lib_id_generate_preview_from_object_exec(bContext *C, wmOperator *UNUSED(op)) +static int lib_id_generate_preview_from_object_exec(bContext *C, wmOperator * /*op*/) { PointerRNA idptr = CTX_data_pointer_get(C, "id"); ID *id = (ID *)idptr.data; @@ -304,7 +304,7 @@ static bool lib_id_override_editable_toggle_poll(bContext *C) return id && ID_IS_OVERRIDE_LIBRARY_REAL(id) && !ID_IS_LINKED(id); } -static int lib_id_override_editable_toggle_exec(bContext *C, wmOperator *UNUSED(op)) +static int lib_id_override_editable_toggle_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); const PointerRNA id_ptr = CTX_data_pointer_get_type(C, "id", &RNA_ID); @@ -346,7 +346,7 @@ static void ED_OT_lib_id_override_editable_toggle(wmOperatorType *ot) /** \name General editor utils. * \{ */ -static int ed_flush_edits_exec(bContext *C, wmOperator *UNUSED(op)) +static int ed_flush_edits_exec(bContext *C, wmOperator * /*op*/) { Main *bmain = CTX_data_main(C); ED_editors_flush_edits(bmain); diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index b7aae20a5ea..06365c3799f 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -596,7 +596,7 @@ void FRS_init_stroke_renderer(Render *re) controller->ResetRenderCount(); } -void FRS_begin_stroke_rendering(Render *UNUSED(re)) +void FRS_begin_stroke_rendering(Render * /*re*/) { } diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp index 6669c021f27..6b23565a23e 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp @@ -120,7 +120,7 @@ PyDoc_STRVAR(BinaryPredicate0D_name_doc, "\n" ":type: str"); -static PyObject *BinaryPredicate0D_name_get(BPy_BinaryPredicate0D *self, void *UNUSED(closure)) +static PyObject *BinaryPredicate0D_name_get(BPy_BinaryPredicate0D *self, void * /*closure*/) { return PyUnicode_FromString(Py_TYPE(self)->tp_name); } diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp index 496900a712b..9e3e5979871 100644 --- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp @@ -155,7 +155,7 @@ PyDoc_STRVAR(BinaryPredicate1D_name_doc, "\n" ":type: str"); -static PyObject *BinaryPredicate1D_name_get(BPy_BinaryPredicate1D *self, void *UNUSED(closure)) +static PyObject *BinaryPredicate1D_name_get(BPy_BinaryPredicate1D *self, void * /*closure*/) { return PyUnicode_FromString(Py_TYPE(self)->tp_name); } diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp index 7eccf0403ae..7f71bbf1fdd 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp +++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp @@ -296,13 +296,13 @@ PyDoc_STRVAR(FrsMaterial_line_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *FrsMaterial_line_get(BPy_FrsMaterial *self, void *UNUSED(closure)) +static PyObject *FrsMaterial_line_get(BPy_FrsMaterial *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 4, FrsMaterial_mathutils_cb_index, MATHUTILS_SUBTYPE_LINE); } -static int FrsMaterial_line_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure)) +static int FrsMaterial_line_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/) { float color[4]; if (mathutils_array_parse(color, 4, 4, value, "value must be a 4-dimensional vector") == -1) { @@ -317,13 +317,13 @@ PyDoc_STRVAR(FrsMaterial_diffuse_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *FrsMaterial_diffuse_get(BPy_FrsMaterial *self, void *UNUSED(closure)) +static PyObject *FrsMaterial_diffuse_get(BPy_FrsMaterial *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 4, FrsMaterial_mathutils_cb_index, MATHUTILS_SUBTYPE_DIFFUSE); } -static int FrsMaterial_diffuse_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure)) +static int FrsMaterial_diffuse_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/) { float color[4]; if (mathutils_array_parse(color, 4, 4, value, "value must be a 4-dimensional vector") == -1) { @@ -338,13 +338,13 @@ PyDoc_STRVAR(FrsMaterial_specular_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *FrsMaterial_specular_get(BPy_FrsMaterial *self, void *UNUSED(closure)) +static PyObject *FrsMaterial_specular_get(BPy_FrsMaterial *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 4, FrsMaterial_mathutils_cb_index, MATHUTILS_SUBTYPE_SPECULAR); } -static int FrsMaterial_specular_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure)) +static int FrsMaterial_specular_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/) { float color[4]; if (mathutils_array_parse(color, 4, 4, value, "value must be a 4-dimensional vector") == -1) { @@ -359,13 +359,13 @@ PyDoc_STRVAR(FrsMaterial_ambient_doc, "\n" ":type: :class:`mathutils.Color`"); -static PyObject *FrsMaterial_ambient_get(BPy_FrsMaterial *self, void *UNUSED(closure)) +static PyObject *FrsMaterial_ambient_get(BPy_FrsMaterial *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 4, FrsMaterial_mathutils_cb_index, MATHUTILS_SUBTYPE_AMBIENT); } -static int FrsMaterial_ambient_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure)) +static int FrsMaterial_ambient_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/) { float color[4]; if (mathutils_array_parse(color, 4, 4, value, "value must be a 4-dimensional vector") == -1) { @@ -380,13 +380,13 @@ PyDoc_STRVAR(FrsMaterial_emission_doc, "\n" ":type: :class:`mathutils.Color`"); -static PyObject *FrsMaterial_emission_get(BPy_FrsMaterial *self, void *UNUSED(closure)) +static PyObject *FrsMaterial_emission_get(BPy_FrsMaterial *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 4, FrsMaterial_mathutils_cb_index, MATHUTILS_SUBTYPE_EMISSION); } -static int FrsMaterial_emission_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure)) +static int FrsMaterial_emission_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/) { float color[4]; if (mathutils_array_parse(color, 4, 4, value, "value must be a 4-dimensional vector") == -1) { @@ -401,12 +401,12 @@ PyDoc_STRVAR(FrsMaterial_shininess_doc, "\n" ":type: float"); -static PyObject *FrsMaterial_shininess_get(BPy_FrsMaterial *self, void *UNUSED(closure)) +static PyObject *FrsMaterial_shininess_get(BPy_FrsMaterial *self, void * /*closure*/) { return PyFloat_FromDouble(self->m->shininess()); } -static int FrsMaterial_shininess_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure)) +static int FrsMaterial_shininess_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/) { float scalar; if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) { @@ -423,12 +423,12 @@ PyDoc_STRVAR(FrsMaterial_priority_doc, "\n" ":type: int"); -static PyObject *FrsMaterial_priority_get(BPy_FrsMaterial *self, void *UNUSED(closure)) +static PyObject *FrsMaterial_priority_get(BPy_FrsMaterial *self, void * /*closure*/) { return PyLong_FromLong(self->m->priority()); } -static int FrsMaterial_priority_set(BPy_FrsMaterial *self, PyObject *value, void *UNUSED(closure)) +static int FrsMaterial_priority_set(BPy_FrsMaterial *self, PyObject *value, void * /*closure*/) { int scalar; if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) { diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp index fd665f56189..dc6592769b8 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.cpp +++ b/source/blender/freestyle/intern/python/BPy_Id.cpp @@ -109,12 +109,12 @@ PyDoc_STRVAR(Id_first_doc, "\n" ":type: int"); -static PyObject *Id_first_get(BPy_Id *self, void *UNUSED(closure)) +static PyObject *Id_first_get(BPy_Id *self, void * /*closure*/) { return PyLong_FromLong(self->id->getFirst()); } -static int Id_first_set(BPy_Id *self, PyObject *value, void *UNUSED(closure)) +static int Id_first_set(BPy_Id *self, PyObject *value, void * /*closure*/) { int scalar; if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) { @@ -130,12 +130,12 @@ PyDoc_STRVAR(Id_second_doc, "\n" ":type: int"); -static PyObject *Id_second_get(BPy_Id *self, void *UNUSED(closure)) +static PyObject *Id_second_get(BPy_Id *self, void * /*closure*/) { return PyLong_FromLong(self->id->getSecond()); } -static int Id_second_set(BPy_Id *self, PyObject *value, void *UNUSED(closure)) +static int Id_second_set(BPy_Id *self, PyObject *value, void * /*closure*/) { int scalar; if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) { diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp index c87e58e954b..083fdbf58db 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp @@ -159,7 +159,7 @@ PyDoc_STRVAR(Interface0D_name_doc, "\n" ":type: str"); -static PyObject *Interface0D_name_get(BPy_Interface0D *self, void *UNUSED(closure)) +static PyObject *Interface0D_name_get(BPy_Interface0D *self, void * /*closure*/) { return PyUnicode_FromString(Py_TYPE(self)->tp_name); } @@ -169,7 +169,7 @@ PyDoc_STRVAR(Interface0D_point_3d_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *Interface0D_point_3d_get(BPy_Interface0D *self, void *UNUSED(closure)) +static PyObject *Interface0D_point_3d_get(BPy_Interface0D *self, void * /*closure*/) { Vec3f p(self->if0D->getPoint3D()); if (PyErr_Occurred()) { @@ -183,7 +183,7 @@ PyDoc_STRVAR(Interface0D_projected_x_doc, "\n" ":type: float"); -static PyObject *Interface0D_projected_x_get(BPy_Interface0D *self, void *UNUSED(closure)) +static PyObject *Interface0D_projected_x_get(BPy_Interface0D *self, void * /*closure*/) { real x = self->if0D->getProjectedX(); if (PyErr_Occurred()) { @@ -197,7 +197,7 @@ PyDoc_STRVAR(Interface0D_projected_y_doc, "\n" ":type: float"); -static PyObject *Interface0D_projected_y_get(BPy_Interface0D *self, void *UNUSED(closure)) +static PyObject *Interface0D_projected_y_get(BPy_Interface0D *self, void * /*closure*/) { real y = self->if0D->getProjectedY(); if (PyErr_Occurred()) { @@ -211,7 +211,7 @@ PyDoc_STRVAR(Interface0D_projected_z_doc, "\n" ":type: float"); -static PyObject *Interface0D_projected_z_get(BPy_Interface0D *self, void *UNUSED(closure)) +static PyObject *Interface0D_projected_z_get(BPy_Interface0D *self, void * /*closure*/) { real z = self->if0D->getProjectedZ(); if (PyErr_Occurred()) { @@ -225,7 +225,7 @@ PyDoc_STRVAR(Interface0D_point_2d_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *Interface0D_point_2d_get(BPy_Interface0D *self, void *UNUSED(closure)) +static PyObject *Interface0D_point_2d_get(BPy_Interface0D *self, void * /*closure*/) { Vec2f p(self->if0D->getPoint2D()); if (PyErr_Occurred()) { @@ -239,7 +239,7 @@ PyDoc_STRVAR(Interface0D_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *Interface0D_id_get(BPy_Interface0D *self, void *UNUSED(closure)) +static PyObject *Interface0D_id_get(BPy_Interface0D *self, void * /*closure*/) { Id id(self->if0D->getId()); if (PyErr_Occurred()) { @@ -253,7 +253,7 @@ PyDoc_STRVAR(Interface0D_nature_doc, "\n" ":type: :class:`Nature`"); -static PyObject *Interface0D_nature_get(BPy_Interface0D *self, void *UNUSED(closure)) +static PyObject *Interface0D_nature_get(BPy_Interface0D *self, void * /*closure*/) { Nature::VertexNature nature = self->if0D->getNature(); if (PyErr_Occurred()) { diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp index 1a353c2174f..d636fb4e6b8 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp @@ -234,7 +234,7 @@ PyDoc_STRVAR(Interface1D_name_doc, "\n" ":type: str"); -static PyObject *Interface1D_name_get(BPy_Interface1D *self, void *UNUSED(closure)) +static PyObject *Interface1D_name_get(BPy_Interface1D *self, void * /*closure*/) { return PyUnicode_FromString(Py_TYPE(self)->tp_name); } @@ -244,7 +244,7 @@ PyDoc_STRVAR(Interface1D_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *Interface1D_id_get(BPy_Interface1D *self, void *UNUSED(closure)) +static PyObject *Interface1D_id_get(BPy_Interface1D *self, void * /*closure*/) { Id id(self->if1D->getId()); if (PyErr_Occurred()) { @@ -258,7 +258,7 @@ PyDoc_STRVAR(Interface1D_nature_doc, "\n" ":type: :class:`Nature`"); -static PyObject *Interface1D_nature_get(BPy_Interface1D *self, void *UNUSED(closure)) +static PyObject *Interface1D_nature_get(BPy_Interface1D *self, void * /*closure*/) { Nature::VertexNature nature = self->if1D->getNature(); if (PyErr_Occurred()) { @@ -272,7 +272,7 @@ PyDoc_STRVAR(Interface1D_length_2d_doc, "\n" ":type: float"); -static PyObject *Interface1D_length_2d_get(BPy_Interface1D *self, void *UNUSED(closure)) +static PyObject *Interface1D_length_2d_get(BPy_Interface1D *self, void * /*closure*/) { real length = self->if1D->getLength2D(); if (PyErr_Occurred()) { @@ -286,14 +286,12 @@ PyDoc_STRVAR(Interface1D_time_stamp_doc, "\n" ":type: int"); -static PyObject *Interface1D_time_stamp_get(BPy_Interface1D *self, void *UNUSED(closure)) +static PyObject *Interface1D_time_stamp_get(BPy_Interface1D *self, void * /*closure*/) { return PyLong_FromLong(self->if1D->getTimeStamp()); } -static int Interface1D_time_stamp_set(BPy_Interface1D *self, - PyObject *value, - void *UNUSED(closure)) +static int Interface1D_time_stamp_set(BPy_Interface1D *self, PyObject *value, void * /*closure*/) { int timestamp; diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp index 35e6dd5536e..b167faa15e5 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp +++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp @@ -177,7 +177,7 @@ PyDoc_STRVAR(Iterator_name_doc, "\n" ":type: str"); -static PyObject *Iterator_name_get(BPy_Iterator *self, void *UNUSED(closure)) +static PyObject *Iterator_name_get(BPy_Iterator *self, void * /*closure*/) { return PyUnicode_FromString(Py_TYPE(self)->tp_name); } @@ -187,7 +187,7 @@ PyDoc_STRVAR(Iterator_is_begin_doc, "\n" ":type: bool"); -static PyObject *Iterator_is_begin_get(BPy_Iterator *self, void *UNUSED(closure)) +static PyObject *Iterator_is_begin_get(BPy_Iterator *self, void * /*closure*/) { return PyBool_from_bool(self->it->isBegin()); } @@ -197,7 +197,7 @@ PyDoc_STRVAR(Iterator_is_end_doc, "\n" ":type: bool"); -static PyObject *Iterator_is_end_get(BPy_Iterator *self, void *UNUSED(closure)) +static PyObject *Iterator_is_end_get(BPy_Iterator *self, void * /*closure*/) { return PyBool_from_bool(self->it->isEnd()); } diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp index 5e504772786..7fb647119e6 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp @@ -155,13 +155,13 @@ PyDoc_STRVAR(SShape_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *SShape_id_get(BPy_SShape *self, void *UNUSED(closure)) +static PyObject *SShape_id_get(BPy_SShape *self, void * /*closure*/) { Id id(self->ss->getId()); return BPy_Id_from_Id(id); // return a copy } -static int SShape_id_set(BPy_SShape *self, PyObject *value, void *UNUSED(closure)) +static int SShape_id_set(BPy_SShape *self, PyObject *value, void * /*closure*/) { if (!BPy_Id_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an Id"); @@ -176,12 +176,12 @@ PyDoc_STRVAR(SShape_name_doc, "\n" ":type: str"); -static PyObject *SShape_name_get(BPy_SShape *self, void *UNUSED(closure)) +static PyObject *SShape_name_get(BPy_SShape *self, void * /*closure*/) { return PyUnicode_FromString(self->ss->getName().c_str()); } -static int SShape_name_set(BPy_SShape *self, PyObject *value, void *UNUSED(closure)) +static int SShape_name_set(BPy_SShape *self, PyObject *value, void * /*closure*/) { if (!PyUnicode_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a string"); @@ -197,13 +197,13 @@ PyDoc_STRVAR(SShape_bbox_doc, "\n" ":type: :class:`BBox`"); -static PyObject *SShape_bbox_get(BPy_SShape *self, void *UNUSED(closure)) +static PyObject *SShape_bbox_get(BPy_SShape *self, void * /*closure*/) { BBox bb(self->ss->bbox()); return BPy_BBox_from_BBox(bb); // return a copy } -static int SShape_bbox_set(BPy_SShape *self, PyObject *value, void *UNUSED(closure)) +static int SShape_bbox_set(BPy_SShape *self, PyObject *value, void * /*closure*/) { if (!BPy_BBox_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a BBox"); @@ -218,7 +218,7 @@ PyDoc_STRVAR(SShape_vertices_doc, "\n" ":type: List of :class:`SVertex` objects"); -static PyObject *SShape_vertices_get(BPy_SShape *self, void *UNUSED(closure)) +static PyObject *SShape_vertices_get(BPy_SShape *self, void * /*closure*/) { vector vertices = self->ss->getVertexList(); @@ -238,7 +238,7 @@ PyDoc_STRVAR(SShape_edges_doc, "\n" ":type: List of :class:`FEdge` objects"); -static PyObject *SShape_edges_get(BPy_SShape *self, void *UNUSED(closure)) +static PyObject *SShape_edges_get(BPy_SShape *self, void * /*closure*/) { vector edges = self->ss->getEdgeList(); diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp index 86d7a726883..c68c30f9602 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp @@ -545,14 +545,14 @@ PyDoc_STRVAR(StrokeAttribute_alpha_doc, "\n" ":type: float"); -static PyObject *StrokeAttribute_alpha_get(BPy_StrokeAttribute *self, void *UNUSED(closure)) +static PyObject *StrokeAttribute_alpha_get(BPy_StrokeAttribute *self, void * /*closure*/) { return PyFloat_FromDouble(self->sa->getAlpha()); } static int StrokeAttribute_alpha_set(BPy_StrokeAttribute *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { float scalar; if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) { @@ -569,7 +569,7 @@ PyDoc_STRVAR(StrokeAttribute_color_doc, "\n" ":type: :class:`mathutils.Color`"); -static PyObject *StrokeAttribute_color_get(BPy_StrokeAttribute *self, void *UNUSED(closure)) +static PyObject *StrokeAttribute_color_get(BPy_StrokeAttribute *self, void * /*closure*/) { return Color_CreatePyObject_cb( (PyObject *)self, StrokeAttribute_mathutils_cb_index, MATHUTILS_SUBTYPE_COLOR); @@ -577,7 +577,7 @@ static PyObject *StrokeAttribute_color_get(BPy_StrokeAttribute *self, void *UNUS static int StrokeAttribute_color_set(BPy_StrokeAttribute *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { float v[3]; if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) { @@ -594,7 +594,7 @@ PyDoc_STRVAR(StrokeAttribute_thickness_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *StrokeAttribute_thickness_get(BPy_StrokeAttribute *self, void *UNUSED(closure)) +static PyObject *StrokeAttribute_thickness_get(BPy_StrokeAttribute *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 2, StrokeAttribute_mathutils_cb_index, MATHUTILS_SUBTYPE_THICKNESS); @@ -602,7 +602,7 @@ static PyObject *StrokeAttribute_thickness_get(BPy_StrokeAttribute *self, void * static int StrokeAttribute_thickness_set(BPy_StrokeAttribute *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { float v[2]; if (mathutils_array_parse(v, 2, 2, value, "value must be a 2-dimensional vector") == -1) { @@ -617,14 +617,14 @@ PyDoc_STRVAR(StrokeAttribute_visible_doc, "\n" ":type: bool"); -static PyObject *StrokeAttribute_visible_get(BPy_StrokeAttribute *self, void *UNUSED(closure)) +static PyObject *StrokeAttribute_visible_get(BPy_StrokeAttribute *self, void * /*closure*/) { return PyBool_from_bool(self->sa->isVisible()); } static int StrokeAttribute_visible_set(BPy_StrokeAttribute *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!PyBool_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be boolean"); diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp index 2e1e7157b83..f9e1d0e86d3 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp @@ -253,7 +253,7 @@ PyDoc_STRVAR(StrokeShader_name_doc, "\n" ":type: str"); -static PyObject *StrokeShader_name_get(BPy_StrokeShader *self, void *UNUSED(closure)) +static PyObject *StrokeShader_name_get(BPy_StrokeShader *self, void * /*closure*/) { return PyUnicode_FromString(Py_TYPE(self)->tp_name); } diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp index 20941df20be..cf70c989054 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp @@ -91,7 +91,7 @@ PyDoc_STRVAR(UnaryFunction0D_name_doc, "\n" ":type: str"); -static PyObject *UnaryFunction0D_name_get(BPy_UnaryFunction0D *self, void *UNUSED(closure)) +static PyObject *UnaryFunction0D_name_get(BPy_UnaryFunction0D *self, void * /*closure*/) { return PyUnicode_FromString(Py_TYPE(self)->tp_name); } diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp index 6c2877428a7..65604de1f83 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp @@ -85,7 +85,7 @@ PyDoc_STRVAR(UnaryFunction1D_name_doc, "\n" ":type: str"); -static PyObject *UnaryFunction1D_name_get(BPy_UnaryFunction1D *self, void *UNUSED(closure)) +static PyObject *UnaryFunction1D_name_get(BPy_UnaryFunction1D *self, void * /*closure*/) { return PyUnicode_FromString(Py_TYPE(self)->tp_name); } diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp index fe70658fd17..b8169aae9cd 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp @@ -134,7 +134,7 @@ PyDoc_STRVAR(UnaryPredicate0D_name_doc, "\n" ":type: str"); -static PyObject *UnaryPredicate0D_name_get(BPy_UnaryPredicate0D *self, void *UNUSED(closure)) +static PyObject *UnaryPredicate0D_name_get(BPy_UnaryPredicate0D *self, void * /*closure*/) { return PyUnicode_FromString(Py_TYPE(self)->tp_name); } diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp index a42f8bc6963..94ff12a4b56 100644 --- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp @@ -192,7 +192,7 @@ PyDoc_STRVAR(UnaryPredicate1D_name_doc, "\n" ":type: str"); -static PyObject *UnaryPredicate1D_name_get(BPy_UnaryPredicate1D *self, void *UNUSED(closure)) +static PyObject *UnaryPredicate1D_name_get(BPy_UnaryPredicate1D *self, void * /*closure*/) { return PyUnicode_FromString(Py_TYPE(self)->tp_name); } diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp index 075e5220e43..bc000c5f1a7 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp @@ -141,12 +141,12 @@ PyDoc_STRVAR(ViewMap_scene_bbox_doc, "\n" ":type: :class:`BBox`"); -static PyObject *ViewMap_scene_bbox_get(BPy_ViewMap *self, void *UNUSED(closure)) +static PyObject *ViewMap_scene_bbox_get(BPy_ViewMap *self, void * /*closure*/) { return BPy_BBox_from_BBox(self->vm->getScene3dBBox()); } -static int ViewMap_scene_bbox_set(BPy_ViewMap *self, PyObject *value, void *UNUSED(closure)) +static int ViewMap_scene_bbox_set(BPy_ViewMap *self, PyObject *value, void * /*closure*/) { if (!BPy_BBox_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a BBox"); diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp index 319058ea719..77c3c708103 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp @@ -163,7 +163,7 @@ PyDoc_STRVAR(ViewShape_sshape_doc, "\n" ":type: :class:`SShape`"); -static PyObject *ViewShape_sshape_get(BPy_ViewShape *self, void *UNUSED(closure)) +static PyObject *ViewShape_sshape_get(BPy_ViewShape *self, void * /*closure*/) { SShape *ss = self->vs->sshape(); if (!ss) { @@ -172,7 +172,7 @@ static PyObject *ViewShape_sshape_get(BPy_ViewShape *self, void *UNUSED(closure) return BPy_SShape_from_SShape(*ss); } -static int ViewShape_sshape_set(BPy_ViewShape *self, PyObject *value, void *UNUSED(closure)) +static int ViewShape_sshape_set(BPy_ViewShape *self, PyObject *value, void * /*closure*/) { if (!BPy_SShape_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SShape"); @@ -195,7 +195,7 @@ PyDoc_STRVAR(ViewShape_vertices_doc, "\n" ":type: List of :class:`ViewVertex` objects"); -static PyObject *ViewShape_vertices_get(BPy_ViewShape *self, void *UNUSED(closure)) +static PyObject *ViewShape_vertices_get(BPy_ViewShape *self, void * /*closure*/) { vector vertices = self->vs->vertices(); vector::iterator it; @@ -208,7 +208,7 @@ static PyObject *ViewShape_vertices_get(BPy_ViewShape *self, void *UNUSED(closur return py_vertices; } -static int ViewShape_vertices_set(BPy_ViewShape *self, PyObject *value, void *UNUSED(closure)) +static int ViewShape_vertices_set(BPy_ViewShape *self, PyObject *value, void * /*closure*/) { PyObject *item; vector v; @@ -238,7 +238,7 @@ PyDoc_STRVAR(ViewShape_edges_doc, "\n" ":type: List of :class:`ViewEdge` objects"); -static PyObject *ViewShape_edges_get(BPy_ViewShape *self, void *UNUSED(closure)) +static PyObject *ViewShape_edges_get(BPy_ViewShape *self, void * /*closure*/) { vector edges = self->vs->edges(); vector::iterator it; @@ -251,7 +251,7 @@ static PyObject *ViewShape_edges_get(BPy_ViewShape *self, void *UNUSED(closure)) return py_edges; } -static int ViewShape_edges_set(BPy_ViewShape *self, PyObject *value, void *UNUSED(closure)) +static int ViewShape_edges_set(BPy_ViewShape *self, PyObject *value, void * /*closure*/) { PyObject *item; vector v; @@ -281,7 +281,7 @@ PyDoc_STRVAR(ViewShape_name_doc, "\n" ":type: str"); -static PyObject *ViewShape_name_get(BPy_ViewShape *self, void *UNUSED(closure)) +static PyObject *ViewShape_name_get(BPy_ViewShape *self, void * /*closure*/) { return PyUnicode_FromString(self->vs->getName().c_str()); } @@ -291,7 +291,7 @@ PyDoc_STRVAR(ViewShape_library_path_doc, "\n" ":type: str, or None if the ViewShape is not part of a library"); -static PyObject *ViewShape_library_path_get(BPy_ViewShape *self, void *UNUSED(closure)) +static PyObject *ViewShape_library_path_get(BPy_ViewShape *self, void * /*closure*/) { return PyUnicode_FromString(self->vs->getLibraryPath().c_str()); } @@ -301,7 +301,7 @@ PyDoc_STRVAR(ViewShape_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *ViewShape_id_get(BPy_ViewShape *self, void *UNUSED(closure)) +static PyObject *ViewShape_id_get(BPy_ViewShape *self, void * /*closure*/) { Id id(self->vs->getId()); return BPy_Id_from_Id(id); // return a copy diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp index 2b6d40e1710..a4067be3dc1 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp @@ -123,7 +123,7 @@ PyDoc_STRVAR(CurvePoint_first_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *CurvePoint_first_svertex_get(BPy_CurvePoint *self, void *UNUSED(closure)) +static PyObject *CurvePoint_first_svertex_get(BPy_CurvePoint *self, void * /*closure*/) { SVertex *A = self->cp->A(); if (A) { @@ -132,9 +132,7 @@ static PyObject *CurvePoint_first_svertex_get(BPy_CurvePoint *self, void *UNUSED Py_RETURN_NONE; } -static int CurvePoint_first_svertex_set(BPy_CurvePoint *self, - PyObject *value, - void *UNUSED(closure)) +static int CurvePoint_first_svertex_set(BPy_CurvePoint *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -149,7 +147,7 @@ PyDoc_STRVAR(CurvePoint_second_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *CurvePoint_second_svertex_get(BPy_CurvePoint *self, void *UNUSED(closure)) +static PyObject *CurvePoint_second_svertex_get(BPy_CurvePoint *self, void * /*closure*/) { SVertex *B = self->cp->B(); if (B) { @@ -158,9 +156,7 @@ static PyObject *CurvePoint_second_svertex_get(BPy_CurvePoint *self, void *UNUSE Py_RETURN_NONE; } -static int CurvePoint_second_svertex_set(BPy_CurvePoint *self, - PyObject *value, - void *UNUSED(closure)) +static int CurvePoint_second_svertex_set(BPy_CurvePoint *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -176,7 +172,7 @@ PyDoc_STRVAR(CurvePoint_fedge_doc, "\n" ":type: :class:`FEdge`"); -static PyObject *CurvePoint_fedge_get(BPy_CurvePoint *self, void *UNUSED(closure)) +static PyObject *CurvePoint_fedge_get(BPy_CurvePoint *self, void * /*closure*/) { SVertex *A = self->cp->A(); Interface0D *B = (Interface0D *)self->cp->B(); @@ -192,12 +188,12 @@ PyDoc_STRVAR(CurvePoint_t2d_doc, "\n" ":type: float"); -static PyObject *CurvePoint_t2d_get(BPy_CurvePoint *self, void *UNUSED(closure)) +static PyObject *CurvePoint_t2d_get(BPy_CurvePoint *self, void * /*closure*/) { return PyFloat_FromDouble(self->cp->t2d()); } -static int CurvePoint_t2d_set(BPy_CurvePoint *self, PyObject *value, void *UNUSED(closure)) +static int CurvePoint_t2d_set(BPy_CurvePoint *self, PyObject *value, void * /*closure*/) { float scalar; if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) { diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp index 09202127ad2..cb84b7e82ba 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp @@ -265,13 +265,13 @@ PyDoc_STRVAR(SVertex_point_3d_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *SVertex_point_3d_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_point_3d_get(BPy_SVertex *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 3, SVertex_mathutils_cb_index, MATHUTILS_SUBTYPE_POINT3D); } -static int SVertex_point_3d_set(BPy_SVertex *self, PyObject *value, void *UNUSED(closure)) +static int SVertex_point_3d_set(BPy_SVertex *self, PyObject *value, void * /*closure*/) { float v[3]; if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) { @@ -287,13 +287,13 @@ PyDoc_STRVAR(SVertex_point_2d_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *SVertex_point_2d_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_point_2d_get(BPy_SVertex *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 3, SVertex_mathutils_cb_index, MATHUTILS_SUBTYPE_POINT2D); } -static int SVertex_point_2d_set(BPy_SVertex *self, PyObject *value, void *UNUSED(closure)) +static int SVertex_point_2d_set(BPy_SVertex *self, PyObject *value, void * /*closure*/) { float v[3]; if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) { @@ -309,13 +309,13 @@ PyDoc_STRVAR(SVertex_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *SVertex_id_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_id_get(BPy_SVertex *self, void * /*closure*/) { Id id(self->sv->getId()); return BPy_Id_from_Id(id); // return a copy } -static int SVertex_id_set(BPy_SVertex *self, PyObject *value, void *UNUSED(closure)) +static int SVertex_id_set(BPy_SVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_Id_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an Id"); @@ -332,7 +332,7 @@ PyDoc_STRVAR(SVertex_normals_doc, "\n" ":type: list of :class:`mathutils.Vector` objects"); -static PyObject *SVertex_normals_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_normals_get(BPy_SVertex *self, void * /*closure*/) { PyObject *py_normals; set normals = self->sv->normals(); @@ -352,7 +352,7 @@ PyDoc_STRVAR(SVertex_normals_size_doc, "\n" ":type: int"); -static PyObject *SVertex_normals_size_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_normals_size_get(BPy_SVertex *self, void * /*closure*/) { return PyLong_FromLong(self->sv->normalsSize()); } @@ -363,7 +363,7 @@ PyDoc_STRVAR(SVertex_viewvertex_doc, "\n" ":type: :class:`ViewVertex`"); -static PyObject *SVertex_viewvertex_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_viewvertex_get(BPy_SVertex *self, void * /*closure*/) { ViewVertex *vv = self->sv->viewvertex(); if (vv) { @@ -385,7 +385,7 @@ PyDoc_STRVAR(SVertex_curvatures_doc, "\n" ":type: tuple"); -static PyObject *SVertex_curvatures_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_curvatures_get(BPy_SVertex *self, void * /*closure*/) { const CurvatureInfo *info = self->sv->getCurvatureInfo(); if (!info) { diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp index 4695d61af9c..7b9e7bd213a 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp @@ -118,7 +118,7 @@ PyDoc_STRVAR(ViewVertex_nature_doc, "\n" ":type: :class:`Nature`"); -static PyObject *ViewVertex_nature_get(BPy_ViewVertex *self, void *UNUSED(closure)) +static PyObject *ViewVertex_nature_get(BPy_ViewVertex *self, void * /*closure*/) { Nature::VertexNature nature = self->vv->getNature(); if (PyErr_Occurred()) { @@ -127,7 +127,7 @@ static PyObject *ViewVertex_nature_get(BPy_ViewVertex *self, void *UNUSED(closur return BPy_Nature_from_Nature(nature); // return a copy } -static int ViewVertex_nature_set(BPy_ViewVertex *self, PyObject *value, void *UNUSED(closure)) +static int ViewVertex_nature_set(BPy_ViewVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_Nature_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a Nature"); diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp index 228be7f4f76..35eb95c6f23 100644 --- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp @@ -220,14 +220,12 @@ PyDoc_STRVAR(StrokeVertex_attribute_doc, "\n" ":type: :class:`StrokeAttribute`"); -static PyObject *StrokeVertex_attribute_get(BPy_StrokeVertex *self, void *UNUSED(closure)) +static PyObject *StrokeVertex_attribute_get(BPy_StrokeVertex *self, void * /*closure*/) { return BPy_StrokeAttribute_from_StrokeAttribute(self->sv->attribute()); } -static int StrokeVertex_attribute_set(BPy_StrokeVertex *self, - PyObject *value, - void *UNUSED(closure)) +static int StrokeVertex_attribute_set(BPy_StrokeVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_StrokeAttribute_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a StrokeAttribute object"); @@ -242,15 +240,14 @@ PyDoc_STRVAR(StrokeVertex_curvilinear_abscissa_doc, "\n" ":type: float"); -static PyObject *StrokeVertex_curvilinear_abscissa_get(BPy_StrokeVertex *self, - void *UNUSED(closure)) +static PyObject *StrokeVertex_curvilinear_abscissa_get(BPy_StrokeVertex *self, void * /*closure*/) { return PyFloat_FromDouble(self->sv->curvilinearAbscissa()); } static int StrokeVertex_curvilinear_abscissa_set(BPy_StrokeVertex *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { float scalar; if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) { @@ -267,12 +264,12 @@ PyDoc_STRVAR(StrokeVertex_point_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *StrokeVertex_point_get(BPy_StrokeVertex *self, void *UNUSED(closure)) +static PyObject *StrokeVertex_point_get(BPy_StrokeVertex *self, void * /*closure*/) { return Vector_CreatePyObject_cb((PyObject *)self, 2, StrokeVertex_mathutils_cb_index, 0); } -static int StrokeVertex_point_set(BPy_StrokeVertex *self, PyObject *value, void *UNUSED(closure)) +static int StrokeVertex_point_set(BPy_StrokeVertex *self, PyObject *value, void * /*closure*/) { float v[2]; if (mathutils_array_parse(v, 2, 2, value, "value must be a 2-dimensional vector") == -1) { @@ -289,14 +286,14 @@ PyDoc_STRVAR(StrokeVertex_stroke_length_doc, "\n" ":type: float"); -static PyObject *StrokeVertex_stroke_length_get(BPy_StrokeVertex *self, void *UNUSED(closure)) +static PyObject *StrokeVertex_stroke_length_get(BPy_StrokeVertex *self, void * /*closure*/) { return PyFloat_FromDouble(self->sv->strokeLength()); } static int StrokeVertex_stroke_length_set(BPy_StrokeVertex *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { float scalar; if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) { @@ -313,7 +310,7 @@ PyDoc_STRVAR(StrokeVertex_u_doc, "\n" ":type: float"); -static PyObject *StrokeVertex_u_get(BPy_StrokeVertex *self, void *UNUSED(closure)) +static PyObject *StrokeVertex_u_get(BPy_StrokeVertex *self, void * /*closure*/) { return PyFloat_FromDouble(self->sv->u()); } diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp index de9748d41c1..59fead5f70c 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp @@ -63,7 +63,7 @@ PyDoc_STRVAR(NonTVertex_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *NonTVertex_svertex_get(BPy_NonTVertex *self, void *UNUSED(closure)) +static PyObject *NonTVertex_svertex_get(BPy_NonTVertex *self, void * /*closure*/) { SVertex *v = self->ntv->svertex(); if (v) { @@ -72,7 +72,7 @@ static PyObject *NonTVertex_svertex_get(BPy_NonTVertex *self, void *UNUSED(closu Py_RETURN_NONE; } -static int NonTVertex_svertex_set(BPy_NonTVertex *self, PyObject *value, void *UNUSED(closure)) +static int NonTVertex_svertex_set(BPy_NonTVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp index 8dc76c1c448..ca4908cae7b 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp @@ -122,7 +122,7 @@ PyDoc_STRVAR(TVertex_front_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *TVertex_front_svertex_get(BPy_TVertex *self, void *UNUSED(closure)) +static PyObject *TVertex_front_svertex_get(BPy_TVertex *self, void * /*closure*/) { SVertex *v = self->tv->frontSVertex(); if (v) { @@ -131,7 +131,7 @@ static PyObject *TVertex_front_svertex_get(BPy_TVertex *self, void *UNUSED(closu Py_RETURN_NONE; } -static int TVertex_front_svertex_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closure)) +static int TVertex_front_svertex_set(BPy_TVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -146,7 +146,7 @@ PyDoc_STRVAR(TVertex_back_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *TVertex_back_svertex_get(BPy_TVertex *self, void *UNUSED(closure)) +static PyObject *TVertex_back_svertex_get(BPy_TVertex *self, void * /*closure*/) { SVertex *v = self->tv->backSVertex(); if (v) { @@ -155,7 +155,7 @@ static PyObject *TVertex_back_svertex_get(BPy_TVertex *self, void *UNUSED(closur Py_RETURN_NONE; } -static int TVertex_back_svertex_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closure)) +static int TVertex_back_svertex_set(BPy_TVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -170,13 +170,13 @@ PyDoc_STRVAR(TVertex_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *TVertex_id_get(BPy_TVertex *self, void *UNUSED(closure)) +static PyObject *TVertex_id_get(BPy_TVertex *self, void * /*closure*/) { Id id(self->tv->getId()); return BPy_Id_from_Id(id); // return a copy } -static int TVertex_id_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closure)) +static int TVertex_id_set(BPy_TVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_Id_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an Id"); diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp index db4ce6a8162..f73c4a8fed5 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp @@ -125,7 +125,7 @@ PyDoc_STRVAR(FEdge_first_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *FEdge_first_svertex_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_first_svertex_get(BPy_FEdge *self, void * /*closure*/) { SVertex *A = self->fe->vertexA(); if (A) { @@ -134,7 +134,7 @@ static PyObject *FEdge_first_svertex_get(BPy_FEdge *self, void *UNUSED(closure)) Py_RETURN_NONE; } -static int FEdge_first_svertex_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_first_svertex_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -149,7 +149,7 @@ PyDoc_STRVAR(FEdge_second_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *FEdge_second_svertex_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_second_svertex_get(BPy_FEdge *self, void * /*closure*/) { SVertex *B = self->fe->vertexB(); if (B) { @@ -158,7 +158,7 @@ static PyObject *FEdge_second_svertex_get(BPy_FEdge *self, void *UNUSED(closure) Py_RETURN_NONE; } -static int FEdge_second_svertex_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_second_svertex_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -174,7 +174,7 @@ PyDoc_STRVAR(FEdge_next_fedge_doc, "\n" ":type: :class:`FEdge`"); -static PyObject *FEdge_next_fedge_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_next_fedge_get(BPy_FEdge *self, void * /*closure*/) { FEdge *fe = self->fe->nextEdge(); if (fe) { @@ -183,7 +183,7 @@ static PyObject *FEdge_next_fedge_get(BPy_FEdge *self, void *UNUSED(closure)) Py_RETURN_NONE; } -static int FEdge_next_fedge_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_next_fedge_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_FEdge_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an FEdge"); @@ -199,7 +199,7 @@ PyDoc_STRVAR(FEdge_previous_fedge_doc, "\n" ":type: :class:`FEdge`"); -static PyObject *FEdge_previous_fedge_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_previous_fedge_get(BPy_FEdge *self, void * /*closure*/) { FEdge *fe = self->fe->previousEdge(); if (fe) { @@ -208,7 +208,7 @@ static PyObject *FEdge_previous_fedge_get(BPy_FEdge *self, void *UNUSED(closure) Py_RETURN_NONE; } -static int FEdge_previous_fedge_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_previous_fedge_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_FEdge_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an FEdge"); @@ -223,7 +223,7 @@ PyDoc_STRVAR(FEdge_viewedge_doc, "\n" ":type: :class:`ViewEdge`"); -static PyObject *FEdge_viewedge_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_viewedge_get(BPy_FEdge *self, void * /*closure*/) { ViewEdge *ve = self->fe->viewedge(); if (ve) { @@ -232,7 +232,7 @@ static PyObject *FEdge_viewedge_get(BPy_FEdge *self, void *UNUSED(closure)) Py_RETURN_NONE; } -static int FEdge_viewedge_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_viewedge_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_ViewEdge_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an ViewEdge"); @@ -247,12 +247,12 @@ PyDoc_STRVAR(FEdge_is_smooth_doc, "\n" ":type: bool"); -static PyObject *FEdge_is_smooth_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_is_smooth_get(BPy_FEdge *self, void * /*closure*/) { return PyBool_from_bool(self->fe->isSmooth()); } -static int FEdge_is_smooth_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_is_smooth_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!PyBool_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be boolean"); @@ -267,13 +267,13 @@ PyDoc_STRVAR(FEdge_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *FEdge_id_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_id_get(BPy_FEdge *self, void * /*closure*/) { Id id(self->fe->getId()); return BPy_Id_from_Id(id); // return a copy } -static int FEdge_id_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_id_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_Id_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an Id"); @@ -288,12 +288,12 @@ PyDoc_STRVAR(FEdge_nature_doc, "\n" ":type: :class:`Nature`"); -static PyObject *FEdge_nature_get(BPy_FEdge *self, void *UNUSED(closure)) +static PyObject *FEdge_nature_get(BPy_FEdge *self, void * /*closure*/) { return BPy_Nature_from_Nature(self->fe->getNature()); } -static int FEdge_nature_set(BPy_FEdge *self, PyObject *value, void *UNUSED(closure)) +static int FEdge_nature_set(BPy_FEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_Nature_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a Nature"); diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp index 726e9f44956..1e69ae65605 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp @@ -146,7 +146,7 @@ PyDoc_STRVAR(FrsCurve_is_empty_doc, "\n" ":type: bool"); -static PyObject *FrsCurve_is_empty_get(BPy_FrsCurve *self, void *UNUSED(closure)) +static PyObject *FrsCurve_is_empty_get(BPy_FrsCurve *self, void * /*closure*/) { return PyBool_from_bool(self->c->empty()); } @@ -156,7 +156,7 @@ PyDoc_STRVAR(FrsCurve_segments_size_doc, "\n" ":type: int"); -static PyObject *FrsCurve_segments_size_get(BPy_FrsCurve *self, void *UNUSED(closure)) +static PyObject *FrsCurve_segments_size_get(BPy_FrsCurve *self, void * /*closure*/) { return PyLong_FromLong(self->c->nSegments()); } diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp index 1c1136bbae7..e9dcedef34e 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp @@ -351,12 +351,12 @@ PyDoc_STRVAR(Stroke_medium_type_doc, "\n" ":type: :class:`MediumType`"); -static PyObject *Stroke_medium_type_get(BPy_Stroke *self, void *UNUSED(closure)) +static PyObject *Stroke_medium_type_get(BPy_Stroke *self, void * /*closure*/) { return BPy_MediumType_from_MediumType(self->s->getMediumType()); } -static int Stroke_medium_type_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure)) +static int Stroke_medium_type_set(BPy_Stroke *self, PyObject *value, void * /*closure*/) { if (!BPy_MediumType_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a MediumType"); @@ -371,12 +371,12 @@ PyDoc_STRVAR(Stroke_texture_id_doc, "\n" ":type: int"); -static PyObject *Stroke_texture_id_get(BPy_Stroke *self, void *UNUSED(closure)) +static PyObject *Stroke_texture_id_get(BPy_Stroke *self, void * /*closure*/) { return PyLong_FromLong(self->s->getTextureId()); } -static int Stroke_texture_id_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure)) +static int Stroke_texture_id_set(BPy_Stroke *self, PyObject *value, void * /*closure*/) { uint i = PyLong_AsUnsignedLong(value); if (PyErr_Occurred()) { @@ -391,12 +391,12 @@ PyDoc_STRVAR(Stroke_tips_doc, "\n" ":type: bool"); -static PyObject *Stroke_tips_get(BPy_Stroke *self, void *UNUSED(closure)) +static PyObject *Stroke_tips_get(BPy_Stroke *self, void * /*closure*/) { return PyBool_from_bool(self->s->hasTips()); } -static int Stroke_tips_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure)) +static int Stroke_tips_set(BPy_Stroke *self, PyObject *value, void * /*closure*/) { if (!PyBool_Check(value)) { return -1; @@ -410,12 +410,12 @@ PyDoc_STRVAR(Stroke_length_2d_doc, "\n" ":type: float"); -static PyObject *Stroke_length_2d_get(BPy_Stroke *self, void *UNUSED(closure)) +static PyObject *Stroke_length_2d_get(BPy_Stroke *self, void * /*closure*/) { return PyFloat_FromDouble(self->s->getLength2D()); } -static int Stroke_length_2d_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure)) +static int Stroke_length_2d_set(BPy_Stroke *self, PyObject *value, void * /*closure*/) { float scalar; if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) { @@ -432,13 +432,13 @@ PyDoc_STRVAR(Stroke_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *Stroke_id_get(BPy_Stroke *self, void *UNUSED(closure)) +static PyObject *Stroke_id_get(BPy_Stroke *self, void * /*closure*/) { Id id(self->s->getId()); return BPy_Id_from_Id(id); // return a copy } -static int Stroke_id_set(BPy_Stroke *self, PyObject *value, void *UNUSED(closure)) +static int Stroke_id_set(BPy_Stroke *self, PyObject *value, void * /*closure*/) { if (!BPy_Id_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an Id"); diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp index 5a58a09d346..1ad8c503782 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp @@ -85,7 +85,7 @@ PyDoc_STRVAR(ViewEdge_first_viewvertex_doc, "\n" ":type: :class:`ViewVertex`"); -static PyObject *ViewEdge_first_viewvertex_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_first_viewvertex_get(BPy_ViewEdge *self, void * /*closure*/) { ViewVertex *v = self->ve->A(); if (v) { @@ -94,9 +94,7 @@ static PyObject *ViewEdge_first_viewvertex_get(BPy_ViewEdge *self, void *UNUSED( Py_RETURN_NONE; } -static int ViewEdge_first_viewvertex_set(BPy_ViewEdge *self, - PyObject *value, - void *UNUSED(closure)) +static int ViewEdge_first_viewvertex_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_ViewVertex_Check(value)) { return -1; @@ -110,7 +108,7 @@ PyDoc_STRVAR(ViewEdge_last_viewvertex_doc, "\n" ":type: :class:`ViewVertex`"); -static PyObject *ViewEdge_last_viewvertex_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_last_viewvertex_get(BPy_ViewEdge *self, void * /*closure*/) { ViewVertex *v = self->ve->B(); if (v) { @@ -119,7 +117,7 @@ static PyObject *ViewEdge_last_viewvertex_get(BPy_ViewEdge *self, void *UNUSED(c Py_RETURN_NONE; } -static int ViewEdge_last_viewvertex_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_last_viewvertex_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_ViewVertex_Check(value)) { return -1; @@ -133,7 +131,7 @@ PyDoc_STRVAR(ViewEdge_first_fedge_doc, "\n" ":type: :class:`FEdge`"); -static PyObject *ViewEdge_first_fedge_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_first_fedge_get(BPy_ViewEdge *self, void * /*closure*/) { FEdge *fe = self->ve->fedgeA(); if (fe) { @@ -142,7 +140,7 @@ static PyObject *ViewEdge_first_fedge_get(BPy_ViewEdge *self, void *UNUSED(closu Py_RETURN_NONE; } -static int ViewEdge_first_fedge_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_first_fedge_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_FEdge_Check(value)) { return -1; @@ -156,7 +154,7 @@ PyDoc_STRVAR(ViewEdge_last_fedge_doc, "\n" ":type: :class:`FEdge`"); -static PyObject *ViewEdge_last_fedge_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_last_fedge_get(BPy_ViewEdge *self, void * /*closure*/) { FEdge *fe = self->ve->fedgeB(); if (fe) { @@ -165,7 +163,7 @@ static PyObject *ViewEdge_last_fedge_get(BPy_ViewEdge *self, void *UNUSED(closur Py_RETURN_NONE; } -static int ViewEdge_last_fedge_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_last_fedge_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_FEdge_Check(value)) { return -1; @@ -179,7 +177,7 @@ PyDoc_STRVAR(ViewEdge_viewshape_doc, "\n" ":type: :class:`ViewShape`"); -static PyObject *ViewEdge_viewshape_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_viewshape_get(BPy_ViewEdge *self, void * /*closure*/) { ViewShape *vs = self->ve->viewShape(); if (vs) { @@ -188,7 +186,7 @@ static PyObject *ViewEdge_viewshape_get(BPy_ViewEdge *self, void *UNUSED(closure Py_RETURN_NONE; } -static int ViewEdge_viewshape_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_viewshape_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_ViewShape_Check(value)) { return -1; @@ -203,7 +201,7 @@ PyDoc_STRVAR(ViewEdge_occludee_doc, "\n" ":type: :class:`ViewShape`"); -static PyObject *ViewEdge_occludee_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_occludee_get(BPy_ViewEdge *self, void * /*closure*/) { ViewShape *vs = self->ve->aShape(); if (vs) { @@ -212,7 +210,7 @@ static PyObject *ViewEdge_occludee_get(BPy_ViewEdge *self, void *UNUSED(closure) Py_RETURN_NONE; } -static int ViewEdge_occludee_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_occludee_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_ViewShape_Check(value)) { return -1; @@ -226,7 +224,7 @@ PyDoc_STRVAR(ViewEdge_is_closed_doc, "\n" ":type: bool"); -static PyObject *ViewEdge_is_closed_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_is_closed_get(BPy_ViewEdge *self, void * /*closure*/) { return PyBool_from_bool(self->ve->isClosed()); } @@ -236,13 +234,13 @@ PyDoc_STRVAR(ViewEdge_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *ViewEdge_id_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_id_get(BPy_ViewEdge *self, void * /*closure*/) { Id id(self->ve->getId()); return BPy_Id_from_Id(id); // return a copy } -static int ViewEdge_id_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_id_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_Id_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an Id"); @@ -257,12 +255,12 @@ PyDoc_STRVAR(ViewEdge_nature_doc, "\n" ":type: :class:`Nature`"); -static PyObject *ViewEdge_nature_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_nature_get(BPy_ViewEdge *self, void * /*closure*/) { return BPy_Nature_from_Nature(self->ve->getNature()); } -static int ViewEdge_nature_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_nature_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { if (!BPy_Nature_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a Nature"); @@ -277,12 +275,12 @@ PyDoc_STRVAR(ViewEdge_qi_doc, "\n" ":type: int"); -static PyObject *ViewEdge_qi_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_qi_get(BPy_ViewEdge *self, void * /*closure*/) { return PyLong_FromLong(self->ve->qi()); } -static int ViewEdge_qi_set(BPy_ViewEdge *self, PyObject *value, void *UNUSED(closure)) +static int ViewEdge_qi_set(BPy_ViewEdge *self, PyObject *value, void * /*closure*/) { int qi; @@ -298,14 +296,14 @@ PyDoc_STRVAR(ViewEdge_chaining_time_stamp_doc, "\n" ":type: int"); -static PyObject *ViewEdge_chaining_time_stamp_get(BPy_ViewEdge *self, void *UNUSED(closure)) +static PyObject *ViewEdge_chaining_time_stamp_get(BPy_ViewEdge *self, void * /*closure*/) { return PyLong_FromLong(self->ve->getChainingTimeStamp()); } static int ViewEdge_chaining_time_stamp_set(BPy_ViewEdge *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { int timestamp; diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp index e32910cf53d..0a4d1a5d32c 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp @@ -193,15 +193,13 @@ PyDoc_STRVAR(FEdgeSharp_normal_right_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *FEdgeSharp_normal_right_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_normal_right_get(BPy_FEdgeSharp *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 3, FEdgeSharp_mathutils_cb_index, MATHUTILS_SUBTYPE_NORMAL_A); } -static int FEdgeSharp_normal_right_set(BPy_FEdgeSharp *self, - PyObject *value, - void *UNUSED(closure)) +static int FEdgeSharp_normal_right_set(BPy_FEdgeSharp *self, PyObject *value, void * /*closure*/) { float v[3]; if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) { @@ -217,13 +215,13 @@ PyDoc_STRVAR(FEdgeSharp_normal_left_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *FEdgeSharp_normal_left_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_normal_left_get(BPy_FEdgeSharp *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 3, FEdgeSharp_mathutils_cb_index, MATHUTILS_SUBTYPE_NORMAL_B); } -static int FEdgeSharp_normal_left_set(BPy_FEdgeSharp *self, PyObject *value, void *UNUSED(closure)) +static int FEdgeSharp_normal_left_set(BPy_FEdgeSharp *self, PyObject *value, void * /*closure*/) { float v[3]; if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) { @@ -241,14 +239,14 @@ PyDoc_STRVAR(FEdgeSharp_material_index_right_doc, "\n" ":type: int"); -static PyObject *FEdgeSharp_material_index_right_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_material_index_right_get(BPy_FEdgeSharp *self, void * /*closure*/) { return PyLong_FromLong(self->fes->aFrsMaterialIndex()); } static int FEdgeSharp_material_index_right_set(BPy_FEdgeSharp *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { uint i = PyLong_AsUnsignedLong(value); if (PyErr_Occurred()) { @@ -263,14 +261,14 @@ PyDoc_STRVAR(FEdgeSharp_material_index_left_doc, "\n" ":type: int"); -static PyObject *FEdgeSharp_material_index_left_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_material_index_left_get(BPy_FEdgeSharp *self, void * /*closure*/) { return PyLong_FromLong(self->fes->bFrsMaterialIndex()); } static int FEdgeSharp_material_index_left_set(BPy_FEdgeSharp *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { uint i = PyLong_AsUnsignedLong(value); if (PyErr_Occurred()) { @@ -286,7 +284,7 @@ PyDoc_STRVAR(FEdgeSharp_material_right_doc, "\n" ":type: :class:`Material`"); -static PyObject *FEdgeSharp_material_right_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_material_right_get(BPy_FEdgeSharp *self, void * /*closure*/) { return BPy_FrsMaterial_from_FrsMaterial(self->fes->aFrsMaterial()); } @@ -296,7 +294,7 @@ PyDoc_STRVAR(FEdgeSharp_material_left_doc, "\n" ":type: :class:`Material`"); -static PyObject *FEdgeSharp_material_left_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_material_left_get(BPy_FEdgeSharp *self, void * /*closure*/) { return BPy_FrsMaterial_from_FrsMaterial(self->fes->bFrsMaterial()); } @@ -308,14 +306,14 @@ PyDoc_STRVAR(FEdgeSharp_face_mark_right_doc, "\n" ":type: bool"); -static PyObject *FEdgeSharp_face_mark_right_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_face_mark_right_get(BPy_FEdgeSharp *self, void * /*closure*/) { return PyBool_from_bool(self->fes->aFaceMark()); } static int FEdgeSharp_face_mark_right_set(BPy_FEdgeSharp *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!PyBool_Check(value)) { return -1; @@ -329,14 +327,12 @@ PyDoc_STRVAR(FEdgeSharp_face_mark_left_doc, "\n" ":type: bool"); -static PyObject *FEdgeSharp_face_mark_left_get(BPy_FEdgeSharp *self, void *UNUSED(closure)) +static PyObject *FEdgeSharp_face_mark_left_get(BPy_FEdgeSharp *self, void * /*closure*/) { return PyBool_from_bool(self->fes->bFaceMark()); } -static int FEdgeSharp_face_mark_left_set(BPy_FEdgeSharp *self, - PyObject *value, - void *UNUSED(closure)) +static int FEdgeSharp_face_mark_left_set(BPy_FEdgeSharp *self, PyObject *value, void * /*closure*/) { if (!PyBool_Check(value)) { return -1; diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp index 93943dcda05..51ae9334f37 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp @@ -143,12 +143,12 @@ PyDoc_STRVAR(FEdgeSmooth_normal_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *FEdgeSmooth_normal_get(BPy_FEdgeSmooth *self, void *UNUSED(closure)) +static PyObject *FEdgeSmooth_normal_get(BPy_FEdgeSmooth *self, void * /*closure*/) { return Vector_CreatePyObject_cb((PyObject *)self, 3, FEdgeSmooth_mathutils_cb_index, 0); } -static int FEdgeSmooth_normal_set(BPy_FEdgeSmooth *self, PyObject *value, void *UNUSED(closure)) +static int FEdgeSmooth_normal_set(BPy_FEdgeSmooth *self, PyObject *value, void * /*closure*/) { float v[3]; if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) { @@ -164,14 +164,14 @@ PyDoc_STRVAR(FEdgeSmooth_material_index_doc, "\n" ":type: int"); -static PyObject *FEdgeSmooth_material_index_get(BPy_FEdgeSmooth *self, void *UNUSED(closure)) +static PyObject *FEdgeSmooth_material_index_get(BPy_FEdgeSmooth *self, void * /*closure*/) { return PyLong_FromLong(self->fes->frs_materialIndex()); } static int FEdgeSmooth_material_index_set(BPy_FEdgeSmooth *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { uint i = PyLong_AsUnsignedLong(value); if (PyErr_Occurred()) { @@ -186,7 +186,7 @@ PyDoc_STRVAR(FEdgeSmooth_material_doc, "\n" ":type: :class:`Material`"); -static PyObject *FEdgeSmooth_material_get(BPy_FEdgeSmooth *self, void *UNUSED(closure)) +static PyObject *FEdgeSmooth_material_get(BPy_FEdgeSmooth *self, void * /*closure*/) { return BPy_FrsMaterial_from_FrsMaterial(self->fes->frs_material()); } @@ -196,12 +196,12 @@ PyDoc_STRVAR(FEdgeSmooth_face_mark_doc, "\n" ":type: bool"); -static PyObject *FEdgeSmooth_face_mark_get(BPy_FEdgeSmooth *self, void *UNUSED(closure)) +static PyObject *FEdgeSmooth_face_mark_get(BPy_FEdgeSmooth *self, void * /*closure*/) { return PyBool_from_bool(self->fes->faceMark()); } -static int FEdgeSmooth_face_mark_set(BPy_FEdgeSmooth *self, PyObject *value, void *UNUSED(closure)) +static int FEdgeSmooth_face_mark_set(BPy_FEdgeSmooth *self, PyObject *value, void * /*closure*/) { if (!PyBool_Check(value)) { return -1; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp index 80b5cd4ba3b..883eb3b0beb 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp @@ -124,7 +124,7 @@ PyDoc_STRVAR(AdjacencyIterator_object_doc, "\n" ":type: :class:`ViewEdge`"); -static PyObject *AdjacencyIterator_object_get(BPy_AdjacencyIterator *self, void *UNUSED(closure)) +static PyObject *AdjacencyIterator_object_get(BPy_AdjacencyIterator *self, void * /*closure*/) { if (self->a_it->isEnd()) { PyErr_SetString(PyExc_RuntimeError, "iteration has stopped"); @@ -143,8 +143,7 @@ PyDoc_STRVAR(AdjacencyIterator_is_incoming_doc, "\n" ":type: bool"); -static PyObject *AdjacencyIterator_is_incoming_get(BPy_AdjacencyIterator *self, - void *UNUSED(closure)) +static PyObject *AdjacencyIterator_is_incoming_get(BPy_AdjacencyIterator *self, void * /*closure*/) { if (self->a_it->isEnd()) { PyErr_SetString(PyExc_RuntimeError, "iteration has stopped"); diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp index b4b3fd2bf1f..c38a8a9314c 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp @@ -176,7 +176,7 @@ PyDoc_STRVAR(ChainingIterator_object_doc, "\n" ":type: :class:`ViewEdge`"); -static PyObject *ChainingIterator_object_get(BPy_ChainingIterator *self, void *UNUSED(closure)) +static PyObject *ChainingIterator_object_get(BPy_ChainingIterator *self, void * /*closure*/) { if (self->c_it->isEnd()) { PyErr_SetString(PyExc_RuntimeError, "iteration has stopped"); @@ -195,8 +195,7 @@ PyDoc_STRVAR(ChainingIterator_next_vertex_doc, "\n" ":type: :class:`ViewVertex`"); -static PyObject *ChainingIterator_next_vertex_get(BPy_ChainingIterator *self, - void *UNUSED(closure)) +static PyObject *ChainingIterator_next_vertex_get(BPy_ChainingIterator *self, void * /*closure*/) { ViewVertex *v = self->c_it->getVertex(); if (v) { @@ -212,7 +211,7 @@ PyDoc_STRVAR(ChainingIterator_is_incrementing_doc, ":type: bool"); static PyObject *ChainingIterator_is_incrementing_get(BPy_ChainingIterator *self, - void *UNUSED(closure)) + void * /*closure*/) { return PyBool_from_bool(self->c_it->isIncrementing()); } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp index e39439dc0b1..c5b7d0f96da 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp @@ -76,7 +76,7 @@ PyDoc_STRVAR(CurvePointIterator_object_doc, "\n" ":type: :class:`CurvePoint`"); -static PyObject *CurvePointIterator_object_get(BPy_CurvePointIterator *self, void *UNUSED(closure)) +static PyObject *CurvePointIterator_object_get(BPy_CurvePointIterator *self, void * /*closure*/) { if (self->cp_it->isEnd()) { PyErr_SetString(PyExc_RuntimeError, "iteration has stopped"); @@ -90,7 +90,7 @@ PyDoc_STRVAR(CurvePointIterator_t_doc, "\n" ":type: float"); -static PyObject *CurvePointIterator_t_get(BPy_CurvePointIterator *self, void *UNUSED(closure)) +static PyObject *CurvePointIterator_t_get(BPy_CurvePointIterator *self, void * /*closure*/) { return PyFloat_FromDouble(self->cp_it->t()); } @@ -100,7 +100,7 @@ PyDoc_STRVAR(CurvePointIterator_u_doc, "\n" ":type: float"); -static PyObject *CurvePointIterator_u_get(BPy_CurvePointIterator *self, void *UNUSED(closure)) +static PyObject *CurvePointIterator_u_get(BPy_CurvePointIterator *self, void * /*closure*/) { return PyFloat_FromDouble(self->cp_it->u()); } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp index def217bb278..6e4b1832c72 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp @@ -133,8 +133,7 @@ PyDoc_STRVAR(Interface0DIterator_object_doc, "\n" ":type: :class:`Interface0D` or one of its subclasses."); -static PyObject *Interface0DIterator_object_get(BPy_Interface0DIterator *self, - void *UNUSED(closure)) +static PyObject *Interface0DIterator_object_get(BPy_Interface0DIterator *self, void * /*closure*/) { if (self->if0D_it->isEnd()) { PyErr_SetString(PyExc_RuntimeError, "iteration has stopped"); @@ -148,7 +147,7 @@ PyDoc_STRVAR(Interface0DIterator_t_doc, "\n" ":type: float"); -static PyObject *Interface0DIterator_t_get(BPy_Interface0DIterator *self, void *UNUSED(closure)) +static PyObject *Interface0DIterator_t_get(BPy_Interface0DIterator *self, void * /*closure*/) { return PyFloat_FromDouble(self->if0D_it->t()); } @@ -158,7 +157,7 @@ PyDoc_STRVAR(Interface0DIterator_u_doc, "\n" ":type: float"); -static PyObject *Interface0DIterator_u_get(BPy_Interface0DIterator *self, void *UNUSED(closure)) +static PyObject *Interface0DIterator_u_get(BPy_Interface0DIterator *self, void * /*closure*/) { return PyFloat_FromDouble(self->if0D_it->u()); } @@ -169,8 +168,7 @@ PyDoc_STRVAR(Interface0DIterator_at_last_doc, "\n" ":type: bool"); -static PyObject *Interface0DIterator_at_last_get(BPy_Interface0DIterator *self, - void *UNUSED(closure)) +static PyObject *Interface0DIterator_at_last_get(BPy_Interface0DIterator *self, void * /*closure*/) { return PyBool_from_bool(self->if0D_it->atLast()); } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp index 922f979b4cb..09b40dc01e3 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp @@ -99,7 +99,7 @@ PyDoc_STRVAR(SVertexIterator_object_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *SVertexIterator_object_get(BPy_SVertexIterator *self, void *UNUSED(closure)) +static PyObject *SVertexIterator_object_get(BPy_SVertexIterator *self, void * /*closure*/) { if (self->sv_it->isEnd()) { PyErr_SetString(PyExc_RuntimeError, "iteration has stopped"); @@ -117,7 +117,7 @@ PyDoc_STRVAR(SVertexIterator_t_doc, "\n" ":type: float"); -static PyObject *SVertexIterator_t_get(BPy_SVertexIterator *self, void *UNUSED(closure)) +static PyObject *SVertexIterator_t_get(BPy_SVertexIterator *self, void * /*closure*/) { return PyFloat_FromDouble(self->sv_it->t()); } @@ -127,7 +127,7 @@ PyDoc_STRVAR(SVertexIterator_u_doc, "\n" ":type: float"); -static PyObject *SVertexIterator_u_get(BPy_SVertexIterator *self, void *UNUSED(closure)) +static PyObject *SVertexIterator_u_get(BPy_SVertexIterator *self, void * /*closure*/) { return PyFloat_FromDouble(self->sv_it->u()); } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp index 2a9efcdded4..4cfaa51d794 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp @@ -206,7 +206,7 @@ PyDoc_STRVAR(StrokeVertexIterator_object_doc, ":type: :class:`StrokeVertex`"); static PyObject *StrokeVertexIterator_object_get(BPy_StrokeVertexIterator *self, - void *UNUSED(closure)) + void * /*closure*/) { if (self->sv_it->isEnd()) { PyErr_SetString(PyExc_RuntimeError, "iteration has stopped"); @@ -224,7 +224,7 @@ PyDoc_STRVAR(StrokeVertexIterator_t_doc, "\n" ":type: float"); -static PyObject *StrokeVertexIterator_t_get(BPy_StrokeVertexIterator *self, void *UNUSED(closure)) +static PyObject *StrokeVertexIterator_t_get(BPy_StrokeVertexIterator *self, void * /*closure*/) { return PyFloat_FromDouble(self->sv_it->t()); } @@ -234,7 +234,7 @@ PyDoc_STRVAR(StrokeVertexIterator_u_doc, "\n" ":type: float"); -static PyObject *StrokeVertexIterator_u_get(BPy_StrokeVertexIterator *self, void *UNUSED(closure)) +static PyObject *StrokeVertexIterator_u_get(BPy_StrokeVertexIterator *self, void * /*closure*/) { return PyFloat_FromDouble(self->sv_it->u()); } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp index 634d4d6434b..937a7103c66 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp @@ -104,7 +104,7 @@ PyDoc_STRVAR(ViewEdgeIterator_object_doc, "\n" ":type: :class:`ViewEdge`"); -static PyObject *ViewEdgeIterator_object_get(BPy_ViewEdgeIterator *self, void *UNUSED(closure)) +static PyObject *ViewEdgeIterator_object_get(BPy_ViewEdgeIterator *self, void * /*closure*/) { if (!self->ve_it->isEnd()) { PyErr_SetString(PyExc_RuntimeError, "iteration has stopped"); @@ -122,8 +122,7 @@ PyDoc_STRVAR(ViewEdgeIterator_current_edge_doc, "\n" ":type: :class:`ViewEdge`"); -static PyObject *ViewEdgeIterator_current_edge_get(BPy_ViewEdgeIterator *self, - void *UNUSED(closure)) +static PyObject *ViewEdgeIterator_current_edge_get(BPy_ViewEdgeIterator *self, void * /*closure*/) { ViewEdge *ve = self->ve_it->getCurrentEdge(); if (ve) { @@ -134,7 +133,7 @@ static PyObject *ViewEdgeIterator_current_edge_get(BPy_ViewEdgeIterator *self, static int ViewEdgeIterator_current_edge_set(BPy_ViewEdgeIterator *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!BPy_ViewEdge_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a ViewEdge"); @@ -153,15 +152,14 @@ PyDoc_STRVAR(ViewEdgeIterator_orientation_doc, "\n" ":type: bool"); -static PyObject *ViewEdgeIterator_orientation_get(BPy_ViewEdgeIterator *self, - void *UNUSED(closure)) +static PyObject *ViewEdgeIterator_orientation_get(BPy_ViewEdgeIterator *self, void * /*closure*/) { return PyBool_from_bool(self->ve_it->getOrientation()); } static int ViewEdgeIterator_orientation_set(BPy_ViewEdgeIterator *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!PyBool_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a boolean"); @@ -176,7 +174,7 @@ PyDoc_STRVAR(ViewEdgeIterator_begin_doc, "\n" ":type: :class:`ViewEdge`"); -static PyObject *ViewEdgeIterator_begin_get(BPy_ViewEdgeIterator *self, void *UNUSED(closure)) +static PyObject *ViewEdgeIterator_begin_get(BPy_ViewEdgeIterator *self, void * /*closure*/) { ViewEdge *ve = self->ve_it->getBegin(); if (ve) { @@ -187,7 +185,7 @@ static PyObject *ViewEdgeIterator_begin_get(BPy_ViewEdgeIterator *self, void *UN static int ViewEdgeIterator_begin_set(BPy_ViewEdgeIterator *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!BPy_ViewEdge_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a ViewEdge"); diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp index 504c43a8542..f503494b898 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp @@ -107,7 +107,7 @@ PyDoc_STRVAR(orientedViewEdgeIterator_object_doc, ":type: (:class:`ViewEdge`, bool)"); static PyObject *orientedViewEdgeIterator_object_get(BPy_orientedViewEdgeIterator *self, - void *UNUSED(closure)) + void * /*closure*/) { if (self->ove_it->isEnd()) { PyErr_SetString(PyExc_RuntimeError, "iteration has stopped"); diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp index 4e4e4d31385..3fe84b3a76f 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp @@ -223,14 +223,14 @@ PyDoc_STRVAR(integration_type_doc, "\n" ":type: :class:`IntegrationType`"); -static PyObject *integration_type_get(BPy_UnaryFunction1DDouble *self, void *UNUSED(closure)) +static PyObject *integration_type_get(BPy_UnaryFunction1DDouble *self, void * /*closure*/) { return BPy_IntegrationType_from_IntegrationType(self->uf1D_double->getIntegrationType()); } static int integration_type_set(BPy_UnaryFunction1DDouble *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!BPy_IntegrationType_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp index ce654de8bc0..33f534e9860 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp @@ -130,14 +130,14 @@ PyDoc_STRVAR(integration_type_doc, "\n" ":type: :class:`IntegrationType`"); -static PyObject *integration_type_get(BPy_UnaryFunction1DEdgeNature *self, void *UNUSED(closure)) +static PyObject *integration_type_get(BPy_UnaryFunction1DEdgeNature *self, void * /*closure*/) { return BPy_IntegrationType_from_IntegrationType(self->uf1D_edgenature->getIntegrationType()); } static int integration_type_set(BPy_UnaryFunction1DEdgeNature *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!BPy_IntegrationType_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp index 83958dbb3d7..c18bbff53c5 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp @@ -119,14 +119,14 @@ PyDoc_STRVAR(integration_type_doc, "\n" ":type: :class:`IntegrationType`"); -static PyObject *integration_type_get(BPy_UnaryFunction1DFloat *self, void *UNUSED(closure)) +static PyObject *integration_type_get(BPy_UnaryFunction1DFloat *self, void * /*closure*/) { return BPy_IntegrationType_from_IntegrationType(self->uf1D_float->getIntegrationType()); } static int integration_type_set(BPy_UnaryFunction1DFloat *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!BPy_IntegrationType_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp index 8929e9e4024..41bc3199271 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp @@ -129,14 +129,14 @@ PyDoc_STRVAR(integration_type_doc, "\n" ":type: :class:`IntegrationType`"); -static PyObject *integration_type_get(BPy_UnaryFunction1DUnsigned *self, void *UNUSED(closure)) +static PyObject *integration_type_get(BPy_UnaryFunction1DUnsigned *self, void * /*closure*/) { return BPy_IntegrationType_from_IntegrationType(self->uf1D_unsigned->getIntegrationType()); } static int integration_type_set(BPy_UnaryFunction1DUnsigned *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!BPy_IntegrationType_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp index c7bd84b0d18..bc76a83515b 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp @@ -134,14 +134,14 @@ PyDoc_STRVAR(integration_type_doc, "\n" ":type: :class:`IntegrationType`"); -static PyObject *integration_type_get(BPy_UnaryFunction1DVec2f *self, void *UNUSED(closure)) +static PyObject *integration_type_get(BPy_UnaryFunction1DVec2f *self, void * /*closure*/) { return BPy_IntegrationType_from_IntegrationType(self->uf1D_vec2f->getIntegrationType()); } static int integration_type_set(BPy_UnaryFunction1DVec2f *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!BPy_IntegrationType_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp index 1eced4cd9f1..7a5521f7571 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp @@ -127,14 +127,14 @@ PyDoc_STRVAR(integration_type_doc, "\n" ":type: :class:`IntegrationType`"); -static PyObject *integration_type_get(BPy_UnaryFunction1DVec3f *self, void *UNUSED(closure)) +static PyObject *integration_type_get(BPy_UnaryFunction1DVec3f *self, void * /*closure*/) { return BPy_IntegrationType_from_IntegrationType(self->uf1D_vec3f->getIntegrationType()); } static int integration_type_set(BPy_UnaryFunction1DVec3f *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!BPy_IntegrationType_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp index 44f12c9e307..242f4a141bc 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp @@ -153,8 +153,7 @@ PyDoc_STRVAR(integration_type_doc, "\n" ":type: :class:`IntegrationType`"); -static PyObject *integration_type_get(BPy_UnaryFunction1DVectorViewShape *self, - void *UNUSED(closure)) +static PyObject *integration_type_get(BPy_UnaryFunction1DVectorViewShape *self, void * /*closure*/) { return BPy_IntegrationType_from_IntegrationType( self->uf1D_vectorviewshape->getIntegrationType()); @@ -162,7 +161,7 @@ static PyObject *integration_type_get(BPy_UnaryFunction1DVectorViewShape *self, static int integration_type_set(BPy_UnaryFunction1DVectorViewShape *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { if (!BPy_IntegrationType_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp index 84152b8141f..7f952f1c991 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp @@ -142,14 +142,12 @@ PyDoc_STRVAR(integration_type_doc, "\n" ":type: :class:`IntegrationType`"); -static PyObject *integration_type_get(BPy_UnaryFunction1DVoid *self, void *UNUSED(closure)) +static PyObject *integration_type_get(BPy_UnaryFunction1DVoid *self, void * /*closure*/) { return BPy_IntegrationType_from_IntegrationType(self->uf1D_void->getIntegrationType()); } -static int integration_type_set(BPy_UnaryFunction1DVoid *self, - PyObject *value, - void *UNUSED(closure)) +static int integration_type_set(BPy_UnaryFunction1DVoid *self, PyObject *value, void * /*closure*/) { if (!BPy_IntegrationType_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); diff --git a/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp index 6c5ea5ffd8a..cc5d8ef6ed4 100644 --- a/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp +++ b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp @@ -25,42 +25,42 @@ VISIT(NodeLight) VISIT(NodeDrawingStyle) VISIT(NodeTransform) -void ScenePrettyPrinter::visitNodeShapeBefore(NodeShape &UNUSED(shape)) +void ScenePrettyPrinter::visitNodeShapeBefore(NodeShape & /*shape*/) { increaseSpace(); } -void ScenePrettyPrinter::visitNodeShapeAfter(NodeShape &UNUSED(shape)) +void ScenePrettyPrinter::visitNodeShapeAfter(NodeShape & /*shape*/) { decreaseSpace(); } -void ScenePrettyPrinter::visitNodeGroupBefore(NodeGroup &UNUSED(group)) +void ScenePrettyPrinter::visitNodeGroupBefore(NodeGroup & /*group*/) { increaseSpace(); } -void ScenePrettyPrinter::visitNodeGroupAfter(NodeGroup &UNUSED(group)) +void ScenePrettyPrinter::visitNodeGroupAfter(NodeGroup & /*group*/) { decreaseSpace(); } -void ScenePrettyPrinter::visitNodeDrawingStyleBefore(NodeDrawingStyle &UNUSED(style)) +void ScenePrettyPrinter::visitNodeDrawingStyleBefore(NodeDrawingStyle & /*style*/) { increaseSpace(); } -void ScenePrettyPrinter::visitNodeDrawingStyleAfter(NodeDrawingStyle &UNUSED(style)) +void ScenePrettyPrinter::visitNodeDrawingStyleAfter(NodeDrawingStyle & /*style*/) { decreaseSpace(); } -void ScenePrettyPrinter::visitNodeTransformBefore(NodeTransform &UNUSED(transform)) +void ScenePrettyPrinter::visitNodeTransformBefore(NodeTransform & /*transform*/) { increaseSpace(); } -void ScenePrettyPrinter::visitNodeTransformAfter(NodeTransform &UNUSED(transform)) +void ScenePrettyPrinter::visitNodeTransformAfter(NodeTransform & /*transform*/) { decreaseSpace(); } diff --git a/source/blender/freestyle/intern/view_map/Interface0D.cpp b/source/blender/freestyle/intern/view_map/Interface0D.cpp index 8c5e762d147..a7e767cc551 100644 --- a/source/blender/freestyle/intern/view_map/Interface0D.cpp +++ b/source/blender/freestyle/intern/view_map/Interface0D.cpp @@ -62,7 +62,7 @@ Geometry::Vec2r Interface0D::getPoint2D() const return 0; } -FEdge *Interface0D::getFEdge(Interface0D &UNUSED(element)) +FEdge *Interface0D::getFEdge(Interface0D & /*element*/) { PyErr_SetString(PyExc_TypeError, "method getFEdge() not properly overridden"); return nullptr; diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp index 75b716ee9da..86c264892e0 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp @@ -19,7 +19,7 @@ NodeGroup *ViewMapTesselator::Tesselate(ViewMap *iViewMap) return Tesselate(viewedges.begin(), viewedges.end()); } -NodeGroup *ViewMapTesselator::Tesselate(WShape *UNUSED(iWShape)) +NodeGroup *ViewMapTesselator::Tesselate(WShape * /*iWShape*/) { return nullptr; } diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index 9086593a945..5155f06a1bb 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -38,7 +38,7 @@ static bool angle_obtuse(WVertex *v, WFace *f) // FIXME // WVvertex is useless but kept for history reasons -static bool triangle_obtuse(WVertex *UNUSED(v), WFace *f) +static bool triangle_obtuse(WVertex * /*v*/, WFace *f) { bool b = false; for (int i = 0; i < 3; i++) { diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp index bb6ff066d03..6f30f73d086 100644 --- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp @@ -50,7 +50,7 @@ void WingedEdgeBuilder::visitNodeTransform(NodeTransform &tn) _current_matrix = new_matrix; } -void WingedEdgeBuilder::visitNodeTransformAfter(NodeTransform &UNUSED(transform)) +void WingedEdgeBuilder::visitNodeTransformAfter(NodeTransform & /*transform*/) { delete _current_matrix; diff --git a/source/blender/functions/FN_field.hh b/source/blender/functions/FN_field.hh index bf2fbfa3f3c..bff9c77ef7d 100644 --- a/source/blender/functions/FN_field.hh +++ b/source/blender/functions/FN_field.hh @@ -412,7 +412,7 @@ class FieldEvaluator : NonMovable, NonCopyable { const int field_index = fields_to_evaluate_.append_and_get_index(std::move(field)); dst_varrays_.append({}); output_pointer_infos_.append(OutputPointerInfo{ - varray_ptr, [](void *dst, const GVArray &varray, ResourceScope &UNUSED(scope)) { + varray_ptr, [](void *dst, const GVArray &varray, ResourceScope & /*scope*/) { *(VArray *)dst = varray.typed(); }}); return field_index; diff --git a/source/blender/functions/FN_multi_function.hh b/source/blender/functions/FN_multi_function.hh index accbaf899be..7089f6895a7 100644 --- a/source/blender/functions/FN_multi_function.hh +++ b/source/blender/functions/FN_multi_function.hh @@ -60,7 +60,7 @@ class MultiFunction { return get_default_hash(this); } - virtual bool equals(const MultiFunction &UNUSED(other)) const + virtual bool equals(const MultiFunction & /*other*/) const { return false; } diff --git a/source/blender/functions/FN_multi_function_builder.hh b/source/blender/functions/FN_multi_function_builder.hh index 75a2414801d..eeadb1938bb 100644 --- a/source/blender/functions/FN_multi_function_builder.hh +++ b/source/blender/functions/FN_multi_function_builder.hh @@ -413,7 +413,7 @@ template class CustomMF : public MultiFunction { ...); } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { fn_(mask, params); } @@ -571,7 +571,7 @@ template class CustomMF_SM : public MultiFunction { }; } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { MutableSpan mut1 = params.single_mutable(0); function_(mask, mut1); @@ -631,7 +631,7 @@ template class CustomMF_Constant : public MultiFunction { this->set_signature(&signature_); } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { MutableSpan output = params.uninitialized_single_output(0); mask.to_best_mask_type([&](const auto &mask) { diff --git a/source/blender/functions/intern/field.cc b/source/blender/functions/intern/field.cc index dca12859b72..d2205864945 100644 --- a/source/blender/functions/intern/field.cc +++ b/source/blender/functions/intern/field.cc @@ -552,9 +552,9 @@ GVArray IndexFieldInput::get_index_varray(IndexMask mask) return VArray::ForFunc(mask.min_array_size(), index_func); } -GVArray IndexFieldInput::get_varray_for_context(const fn::FieldContext &UNUSED(context), +GVArray IndexFieldInput::get_varray_for_context(const fn::FieldContext & /*context*/, IndexMask mask, - ResourceScope &UNUSED(scope)) const + ResourceScope & /*scope*/) const { /* TODO: Investigate a similar method to IndexRange::as_span() */ return get_index_varray(mask); @@ -743,7 +743,7 @@ int FieldEvaluator::add(GField field, GVArray *varray_ptr) const int field_index = fields_to_evaluate_.append_and_get_index(std::move(field)); dst_varrays_.append(nullptr); output_pointer_infos_.append(OutputPointerInfo{ - varray_ptr, [](void *dst, const GVArray &varray, ResourceScope &UNUSED(scope)) { + varray_ptr, [](void *dst, const GVArray &varray, ResourceScope & /*scope*/) { *static_cast(dst) = varray; }}); return field_index; diff --git a/source/blender/functions/intern/lazy_function.cc b/source/blender/functions/intern/lazy_function.cc index 2d69af84f85..f1c53a04b3f 100644 --- a/source/blender/functions/intern/lazy_function.cc +++ b/source/blender/functions/intern/lazy_function.cc @@ -25,7 +25,7 @@ std::string LazyFunction::output_name(int index) const return outputs_[index].debug_name; } -void *LazyFunction::init_storage(LinearAllocator<> &UNUSED(allocator)) const +void *LazyFunction::init_storage(LinearAllocator<> & /*allocator*/) const { return nullptr; } diff --git a/source/blender/functions/intern/multi_function_builder.cc b/source/blender/functions/intern/multi_function_builder.cc index 8a09ed37e19..32a41f99c48 100644 --- a/source/blender/functions/intern/multi_function_builder.cc +++ b/source/blender/functions/intern/multi_function_builder.cc @@ -32,9 +32,7 @@ CustomMF_GenericConstant::~CustomMF_GenericConstant() } } -void CustomMF_GenericConstant::call(IndexMask mask, - MFParams params, - MFContext UNUSED(context)) const +void CustomMF_GenericConstant::call(IndexMask mask, MFParams params, MFContext /*context*/) const { GMutableSpan output = params.uninitialized_single_output(0); type_.fill_construct_indices(value_, output.data(), mask); @@ -68,7 +66,7 @@ CustomMF_GenericConstantArray::CustomMF_GenericConstantArray(GSpan array) : arra void CustomMF_GenericConstantArray::call(IndexMask mask, MFParams params, - MFContext UNUSED(context)) const + MFContext /*context*/) const { GVectorArray &vectors = params.vector_output(0); for (int64_t i : mask) { @@ -90,7 +88,7 @@ CustomMF_DefaultOutput::CustomMF_DefaultOutput(Span input_types, signature_ = signature.build(); this->set_signature(&signature_); } -void CustomMF_DefaultOutput::call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const +void CustomMF_DefaultOutput::call(IndexMask mask, MFParams params, MFContext /*context*/) const { for (int param_index : this->param_indices()) { MFParamType param_type = this->param_type(param_index); @@ -115,7 +113,7 @@ CustomMF_GenericCopy::CustomMF_GenericCopy(MFDataType data_type) this->set_signature(&signature_); } -void CustomMF_GenericCopy::call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const +void CustomMF_GenericCopy::call(IndexMask mask, MFParams params, MFContext /*context*/) const { const MFDataType data_type = this->param_type(0).data_type(); switch (data_type.category()) { diff --git a/source/blender/functions/intern/multi_function_procedure.cc b/source/blender/functions/intern/multi_function_procedure.cc index 7ad324a9574..b78787de57c 100644 --- a/source/blender/functions/intern/multi_function_procedure.cc +++ b/source/blender/functions/intern/multi_function_procedure.cc @@ -801,12 +801,12 @@ class MFProcedureDotExport { variable_to_string(instruction.variable(), ss); } - void instruction_to_string(const MFDummyInstruction &UNUSED(instruction), std::stringstream &ss) + void instruction_to_string(const MFDummyInstruction & /*instruction*/, std::stringstream &ss) { instruction_name_format("Dummy ", ss); } - void instruction_to_string(const MFReturnInstruction &UNUSED(instruction), std::stringstream &ss) + void instruction_to_string(const MFReturnInstruction & /*instruction*/, std::stringstream &ss) { instruction_name_format("Return ", ss); diff --git a/source/blender/functions/tests/FN_field_test.cc b/source/blender/functions/tests/FN_field_test.cc index ea3c0471411..8c5cc817174 100644 --- a/source/blender/functions/tests/FN_field_test.cc +++ b/source/blender/functions/tests/FN_field_test.cc @@ -34,9 +34,9 @@ class IndexFieldInput final : public FieldInput { { } - GVArray get_varray_for_context(const FieldContext &UNUSED(context), + GVArray get_varray_for_context(const FieldContext & /*context*/, IndexMask mask, - ResourceScope &UNUSED(scope)) const final + ResourceScope & /*scope*/) const final { auto index_func = [](int i) { return i; }; return VArray::ForFunc(mask.min_array_size(), index_func); @@ -171,7 +171,7 @@ class TwoOutputFunction : public MultiFunction { this->set_signature(&signature_); } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { const VArray &in1 = params.readonly_single_input(0, "In1"); const VArray &in2 = params.readonly_single_input(1, "In2"); diff --git a/source/blender/functions/tests/FN_lazy_function_test.cc b/source/blender/functions/tests/FN_lazy_function_test.cc index 8df064cd8a6..dc1c698598d 100644 --- a/source/blender/functions/tests/FN_lazy_function_test.cc +++ b/source/blender/functions/tests/FN_lazy_function_test.cc @@ -21,7 +21,7 @@ class AddLazyFunction : public LazyFunction { outputs_.append({"Result", CPPType::get()}); } - void execute_impl(Params ¶ms, const Context &UNUSED(context)) const override + void execute_impl(Params ¶ms, const Context & /*context*/) const override { const int a = params.get_input(0); const int b = params.get_input(1); @@ -42,7 +42,7 @@ class StoreValueFunction : public LazyFunction { inputs_.append({"B", CPPType::get(), ValueUsage::Maybe}); } - void execute_impl(Params ¶ms, const Context &UNUSED(context)) const override + void execute_impl(Params ¶ms, const Context & /*context*/) const override { *dst1_ = params.get_input(0); if (int *value = params.try_get_input_data_ptr_or_request(1)) { @@ -62,7 +62,7 @@ class SimpleSideEffectProvider : public GraphExecutor::SideEffectProvider { } Vector get_nodes_with_side_effects( - const Context &UNUSED(context)) const override + const Context & /*context*/) const override { return side_effect_nodes_; } diff --git a/source/blender/functions/tests/FN_multi_function_test.cc b/source/blender/functions/tests/FN_multi_function_test.cc index c82cde2abce..ca788b0a6ee 100644 --- a/source/blender/functions/tests/FN_multi_function_test.cc +++ b/source/blender/functions/tests/FN_multi_function_test.cc @@ -26,7 +26,7 @@ class AddFunction : public MultiFunction { return signature.build(); } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { const VArray &a = params.readonly_single_input(0, "A"); const VArray &b = params.readonly_single_input(1, "B"); diff --git a/source/blender/functions/tests/FN_multi_function_test_common.hh b/source/blender/functions/tests/FN_multi_function_test_common.hh index a01a3fa27c6..15e8baf2001 100644 --- a/source/blender/functions/tests/FN_multi_function_test_common.hh +++ b/source/blender/functions/tests/FN_multi_function_test_common.hh @@ -20,7 +20,7 @@ class AddPrefixFunction : public MultiFunction { return signature.build(); } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { const VArray &prefixes = params.readonly_single_input(0, "Prefix"); MutableSpan strings = params.single_mutable(1, "Strings"); @@ -47,7 +47,7 @@ class CreateRangeFunction : public MultiFunction { return signature.build(); } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { const VArray &sizes = params.readonly_single_input(0, "Size"); GVectorArray &ranges = params.vector_output(1, "Range"); @@ -75,7 +75,7 @@ class GenericAppendFunction : public MultiFunction { this->set_signature(&signature_); } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { GVectorArray &vectors = params.vector_mutable(0, "Vector"); const GVArray &values = params.readonly_single_input(1, "Value"); @@ -105,7 +105,7 @@ class ConcatVectorsFunction : public MultiFunction { return signature.build(); } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { GVectorArray &a = params.vector_mutable(0); const GVVectorArray &b = params.readonly_vector_input(1); @@ -129,7 +129,7 @@ class AppendFunction : public MultiFunction { return signature.build(); } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { GVectorArray_TypedMutableRef vectors = params.vector_mutable(0); const VArray &values = params.readonly_single_input(1); @@ -156,7 +156,7 @@ class SumVectorFunction : public MultiFunction { return signature.build(); } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { const VVectorArray &vectors = params.readonly_vector_input(0); MutableSpan sums = params.uninitialized_single_output(1); @@ -187,7 +187,7 @@ class OptionalOutputsFunction : public MultiFunction { return signature.build(); } - void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override + void call(IndexMask mask, MFParams params, MFContext /*context*/) const override { if (params.single_output_is_required(0, "Out 1")) { MutableSpan values = params.uninitialized_single_output(0, "Out 1"); diff --git a/source/blender/geometry/intern/mesh_to_volume.cc b/source/blender/geometry/intern/mesh_to_volume.cc index 4aa25317f90..b6025f8f1a9 100644 --- a/source/blender/geometry/intern/mesh_to_volume.cc +++ b/source/blender/geometry/intern/mesh_to_volume.cc @@ -25,7 +25,7 @@ class OpenVDBMeshAdapter { OpenVDBMeshAdapter(const Mesh &mesh, float4x4 transform); size_t polygonCount() const; size_t pointCount() const; - size_t vertexCount(size_t UNUSED(polygon_index)) const; + size_t vertexCount(size_t /*polygon_index*/) const; void getIndexSpacePoint(size_t polygon_index, size_t vertex_index, openvdb::Vec3d &pos) const; }; @@ -44,7 +44,7 @@ size_t OpenVDBMeshAdapter::pointCount() const return size_t(verts_.size()); } -size_t OpenVDBMeshAdapter::vertexCount(size_t UNUSED(polygon_index)) const +size_t OpenVDBMeshAdapter::vertexCount(size_t /*polygon_index*/) const { /* All polygons are triangles. */ return 3; diff --git a/source/blender/gpu/intern/gpu_framebuffer.cc b/source/blender/gpu/intern/gpu_framebuffer.cc index 62ec6c1b7da..5fe876fc658 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.cc +++ b/source/blender/gpu/intern/gpu_framebuffer.cc @@ -673,7 +673,7 @@ void GPU_offscreen_bind(GPUOffScreen *ofs, bool save) unwrap(gpu_offscreen_fb_get(ofs))->bind(false); } -void GPU_offscreen_unbind(GPUOffScreen *UNUSED(ofs), bool restore) +void GPU_offscreen_unbind(GPUOffScreen * /*ofs*/, bool restore) { GPUFrameBuffer *fb = nullptr; if (restore) { diff --git a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc index 28456e18354..7a06ede5c6d 100644 --- a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc +++ b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc @@ -41,7 +41,7 @@ UserDef U; /** \name Stubs of BLI_imbuf_types.h * \{ */ -void IMB_freeImBuf(ImBuf *UNUSED(ibuf)) +void IMB_freeImBuf(ImBuf * /*ibuf*/) { BLI_assert_unreachable(); } @@ -52,48 +52,45 @@ void IMB_freeImBuf(ImBuf *UNUSED(ibuf)) /** \name Stubs of UI_resources.h * \{ */ -void UI_GetThemeColor4fv(int UNUSED(colorid), float UNUSED(col[4])) +void UI_GetThemeColor4fv(int /*colorid*/, float UNUSED(col[4])) { BLI_assert_unreachable(); } -void UI_GetThemeColor3fv(int UNUSED(colorid), float UNUSED(col[3])) +void UI_GetThemeColor3fv(int /*colorid*/, float UNUSED(col[3])) { BLI_assert_unreachable(); } -void UI_GetThemeColorShade4fv(int UNUSED(colorid), int UNUSED(offset), float UNUSED(col[4])) +void UI_GetThemeColorShade4fv(int /*colorid*/, int /*offset*/, float UNUSED(col[4])) { BLI_assert_unreachable(); } -void UI_GetThemeColorShadeAlpha4fv(int UNUSED(colorid), - int UNUSED(coloffset), - int UNUSED(alphaoffset), +void UI_GetThemeColorShadeAlpha4fv(int /*colorid*/, + int /*coloffset*/, + int /*alphaoffset*/, float UNUSED(col[4])) { BLI_assert_unreachable(); } -void UI_GetThemeColorBlendShade4fv(int UNUSED(colorid1), - int UNUSED(colorid2), - float UNUSED(fac), - int UNUSED(offset), - float UNUSED(col[4])) +void UI_GetThemeColorBlendShade4fv( + int /*colorid1*/, int /*colorid2*/, float /*fac*/, int /*offset*/, float UNUSED(col[4])) { BLI_assert_unreachable(); } -void UI_GetThemeColorBlend3ubv(int UNUSED(colorid1), - int UNUSED(colorid2), - float UNUSED(fac), +void UI_GetThemeColorBlend3ubv(int /*colorid1*/, + int /*colorid2*/, + float /*fac*/, uchar UNUSED(col[3])) { BLI_assert_unreachable(); } -void UI_GetThemeColorShadeAlpha4ubv(int UNUSED(colorid), - int UNUSED(coloffset), - int UNUSED(alphaoffset), +void UI_GetThemeColorShadeAlpha4ubv(int /*colorid*/, + int /*coloffset*/, + int /*alphaoffset*/, uchar UNUSED(col[4])) { BLI_assert_unreachable(); @@ -105,28 +102,28 @@ void UI_GetThemeColorShadeAlpha4ubv(int UNUSED(colorid), /** \name Stubs of BKE_attribute.h * \{ */ -void BKE_id_attribute_copy_domains_temp(short UNUSED(id_type), - const struct CustomData *UNUSED(vdata), - const struct CustomData *UNUSED(edata), - const struct CustomData *UNUSED(ldata), - const struct CustomData *UNUSED(pdata), - const struct CustomData *UNUSED(cdata), - struct ID *UNUSED(r_id)) +void BKE_id_attribute_copy_domains_temp(short /*id_type*/, + const struct CustomData * /*vdata*/, + const struct CustomData * /*edata*/, + const struct CustomData * /*ldata*/, + const struct CustomData * /*pdata*/, + const struct CustomData * /*cdata*/, + struct ID * /*r_id*/) { } -struct CustomDataLayer *BKE_id_attributes_active_color_get(const struct ID *UNUSED(id)) +struct CustomDataLayer *BKE_id_attributes_active_color_get(const struct ID * /*id*/) { return nullptr; } -struct CustomDataLayer *BKE_id_attributes_render_color_get(const struct ID *UNUSED(id)) +struct CustomDataLayer *BKE_id_attributes_render_color_get(const struct ID * /*id*/) { return nullptr; } -eAttrDomain BKE_id_attribute_domain(const struct ID *UNUSED(id), - const struct CustomDataLayer *UNUSED(layer)) +eAttrDomain BKE_id_attribute_domain(const struct ID * /*id*/, + const struct CustomDataLayer * /*layer*/) { return ATTR_DOMAIN_AUTO; } @@ -136,23 +133,23 @@ eAttrDomain BKE_id_attribute_domain(const struct ID *UNUSED(id), /* -------------------------------------------------------------------- */ /** \name Stubs of BKE_paint.h * \{ */ -bool paint_is_face_hidden(const struct MLoopTri *UNUSED(lt), const bool *UNUSED(hide_poly)) +bool paint_is_face_hidden(const struct MLoopTri * /*lt*/, const bool * /*hide_poly*/) { BLI_assert_unreachable(); return false; } -void BKE_paint_face_set_overlay_color_get(const int UNUSED(face_set), - const int UNUSED(seed), +void BKE_paint_face_set_overlay_color_get(const int /*face_set*/, + const int /*seed*/, uchar UNUSED(r_color[4])) { BLI_assert_unreachable(); } -bool paint_is_grid_face_hidden(const uint *UNUSED(grid_hidden), - int UNUSED(gridsize), - int UNUSED(x), - int UNUSED(y)) +bool paint_is_grid_face_hidden(const uint * /*grid_hidden*/, + int /*gridsize*/, + int /*x*/, + int /*y*/) { BLI_assert_unreachable(); return false; @@ -163,16 +160,16 @@ bool paint_is_grid_face_hidden(const uint *UNUSED(grid_hidden), /* -------------------------------------------------------------------- */ /** \name Stubs of BKE_mesh.h * \{ */ -void BKE_mesh_calc_poly_normal(const struct MPoly *UNUSED(mpoly), - const struct MLoop *UNUSED(loopstart), - const struct MVert *UNUSED(mvarray), +void BKE_mesh_calc_poly_normal(const struct MPoly * /*mpoly*/, + const struct MLoop * /*loopstart*/, + const struct MVert * /*mvarray*/, float UNUSED(r_no[3])) { BLI_assert_unreachable(); } -void BKE_mesh_looptri_get_real_edges(const struct Mesh *UNUSED(mesh), - const struct MLoopTri *UNUSED(looptri), +void BKE_mesh_looptri_get_real_edges(const struct Mesh * /*mesh*/, + const struct MLoopTri * /*looptri*/, int UNUSED(r_edges[3])) { BLI_assert_unreachable(); @@ -195,42 +192,42 @@ void BKE_material_defaults_free_gpu() /** \name Stubs of BKE_customdata.h * \{ */ -int CustomData_get_offset(const struct CustomData *UNUSED(data), int UNUSED(type)) +int CustomData_get_offset(const struct CustomData * /*data*/, int /*type*/) { BLI_assert_unreachable(); return 0; } -int CustomData_get_named_layer_index(const struct CustomData *UNUSED(data), - int UNUSED(type), - const char *UNUSED(name)) +int CustomData_get_named_layer_index(const struct CustomData * /*data*/, + int /*type*/, + const char * /*name*/) { return -1; } -int CustomData_get_active_layer_index(const struct CustomData *UNUSED(data), int UNUSED(type)) +int CustomData_get_active_layer_index(const struct CustomData * /*data*/, int /*type*/) { return -1; } -int CustomData_get_render_layer_index(const struct CustomData *UNUSED(data), int UNUSED(type)) +int CustomData_get_render_layer_index(const struct CustomData * /*data*/, int /*type*/) { return -1; } -bool CustomData_has_layer(const struct CustomData *UNUSED(data), int UNUSED(type)) +bool CustomData_has_layer(const struct CustomData * /*data*/, int /*type*/) { return false; } -void *CustomData_get_layer_named(const struct CustomData *UNUSED(data), - int UNUSED(type), - const char *UNUSED(name)) +void *CustomData_get_layer_named(const struct CustomData * /*data*/, + int /*type*/, + const char * /*name*/) { return nullptr; } -void *CustomData_get_layer(const struct CustomData *UNUSED(data), int UNUSED(type)) +void *CustomData_get_layer(const struct CustomData * /*data*/, int /*type*/) { return nullptr; } @@ -241,10 +238,10 @@ void *CustomData_get_layer(const struct CustomData *UNUSED(data), int UNUSED(typ /** \name Stubs of BKE_pbvh.h * \{ */ -int BKE_pbvh_count_grid_quads(BLI_bitmap **UNUSED(grid_hidden), - const int *UNUSED(grid_indices), - int UNUSED(totgrid), - int UNUSED(gridsize)) +int BKE_pbvh_count_grid_quads(BLI_bitmap ** /*grid_hidden*/, + const int * /*grid_indices*/, + int /*totgrid*/, + int /*gridsize*/) { BLI_assert_unreachable(); return 0; @@ -255,8 +252,7 @@ int BKE_pbvh_count_grid_quads(BLI_bitmap **UNUSED(grid_hidden), /* -------------------------------------------------------------------- */ /** \name Stubs of BKE_subdiv_ccg.h * \{ */ -int BKE_subdiv_ccg_grid_to_face_index(const SubdivCCG *UNUSED(subdiv_ccg), - const int UNUSED(grid_index)) +int BKE_subdiv_ccg_grid_to_face_index(const SubdivCCG * /*subdiv_ccg*/, const int /*grid_index*/) { BLI_assert_unreachable(); return 0; @@ -267,18 +263,18 @@ int BKE_subdiv_ccg_grid_to_face_index(const SubdivCCG *UNUSED(subdiv_ccg), /* -------------------------------------------------------------------- */ /** \name Stubs of BKE_node.h * \{ */ -void ntreeGPUMaterialNodes(struct bNodeTree *UNUSED(localtree), struct GPUMaterial *UNUSED(mat)) +void ntreeGPUMaterialNodes(struct bNodeTree * /*localtree*/, struct GPUMaterial * /*mat*/) { BLI_assert_unreachable(); } -struct bNodeTree *ntreeLocalize(struct bNodeTree *UNUSED(ntree)) +struct bNodeTree *ntreeLocalize(struct bNodeTree * /*ntree*/) { BLI_assert_unreachable(); return nullptr; } -void ntreeFreeLocalTree(struct bNodeTree *UNUSED(ntree)) +void ntreeFreeLocalTree(struct bNodeTree * /*ntree*/) { BLI_assert_unreachable(); } @@ -288,7 +284,7 @@ void ntreeFreeLocalTree(struct bNodeTree *UNUSED(ntree)) /* -------------------------------------------------------------------- */ /** \name Stubs of bmesh.h * \{ */ -void BM_face_as_array_vert_tri(BMFace *UNUSED(f), BMVert *UNUSED(r_verts[3])) +void BM_face_as_array_vert_tri(BMFace * /*f*/, BMVert *UNUSED(r_verts[3])) { BLI_assert_unreachable(); } @@ -297,17 +293,17 @@ void BM_face_as_array_vert_tri(BMFace *UNUSED(f), BMVert *UNUSED(r_verts[3])) /* -------------------------------------------------------------------- */ /** \name Stubs of DRW_engine.h * \{ */ -void DRW_deferred_shader_remove(struct GPUMaterial *UNUSED(mat)) +void DRW_deferred_shader_remove(struct GPUMaterial * /*mat*/) { BLI_assert_unreachable(); } -void DRW_cdlayer_attr_aliases_add(struct GPUVertFormat *UNUSED(format), - const char *UNUSED(base_name), - const struct CustomData *UNUSED(data), - const struct CustomDataLayer *UNUSED(cl), - bool UNUSED(is_active_render), - bool UNUSED(is_active_layer)) +void DRW_cdlayer_attr_aliases_add(struct GPUVertFormat * /*format*/, + const char * /*base_name*/, + const struct CustomData * /*data*/, + const struct CustomDataLayer * /*cl*/, + bool /*is_active_render*/, + bool /*is_active_layer*/) { } diff --git a/source/blender/gpu/intern/gpu_texture.cc b/source/blender/gpu/intern/gpu_texture.cc index a0ee518e747..cd1f8bf582c 100644 --- a/source/blender/gpu/intern/gpu_texture.cc +++ b/source/blender/gpu/intern/gpu_texture.cc @@ -482,7 +482,7 @@ void GPU_unpack_row_length_set(uint len) void GPU_texture_bind_ex(GPUTexture *tex_, eGPUSamplerState state, int unit, - const bool UNUSED(set_number)) + const bool /*set_number*/) { Texture *tex = reinterpret_cast(tex_); state = (state >= GPU_SAMPLER_MAX) ? tex->sampler_state : state; diff --git a/source/blender/gpu/intern/gpu_vertex_format.cc b/source/blender/gpu/intern/gpu_vertex_format.cc index 897e80293bf..b30e3c358c8 100644 --- a/source/blender/gpu/intern/gpu_vertex_format.cc +++ b/source/blender/gpu/intern/gpu_vertex_format.cc @@ -251,7 +251,7 @@ static void safe_bytes(char out[11], const char data[8]) } } -void GPU_vertformat_safe_attr_name(const char *attr_name, char *r_safe_name, uint UNUSED(max_len)) +void GPU_vertformat_safe_attr_name(const char *attr_name, char *r_safe_name, uint /*max_len*/) { char data[8] = {0}; uint len = strlen(attr_name); diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc index 38dd339882d..5c23286c166 100644 --- a/source/blender/gpu/opengl/gl_debug.cc +++ b/source/blender/gpu/opengl/gl_debug.cc @@ -49,13 +49,13 @@ namespace blender::gpu::debug { # define APIENTRY #endif -static void APIENTRY debug_callback(GLenum UNUSED(source), +static void APIENTRY debug_callback(GLenum /*source*/, GLenum type, - GLuint UNUSED(id), + GLuint /*id*/, GLenum severity, - GLsizei UNUSED(length), + GLsizei /*length*/, const GLchar *message, - const GLvoid *UNUSED(userParm)) + const GLvoid * /*userParm*/) { if (ELEM(type, GL_DEBUG_TYPE_PUSH_GROUP, GL_DEBUG_TYPE_POP_GROUP)) { /* The debug layer will emit a message each time a debug group is pushed or popped. diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 8468aaa70b9..c28e8350622 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -456,7 +456,7 @@ static void openexr_header_metadata(Header *header, struct ImBuf *ibuf) static void openexr_header_metadata_callback(void *data, const char *propname, char *prop, - int UNUSED(len)) + int /*len*/) { Header *header = (Header *)data; header->insert(propname, StringAttribute(prop)); @@ -2159,7 +2159,7 @@ struct ImBuf *imb_load_openexr(const uchar *mem, } struct ImBuf *imb_load_filepath_thumbnail_openexr(const char *filepath, - const int UNUSED(flags), + const int /*flags*/, const size_t max_thumb_size, char colorspace[], size_t *r_width, diff --git a/source/blender/imbuf/intern/transform.cc b/source/blender/imbuf/intern/transform.cc index 532652df189..edded204527 100644 --- a/source/blender/imbuf/intern/transform.cc +++ b/source/blender/imbuf/intern/transform.cc @@ -134,8 +134,7 @@ class NoDiscard : public BaseDiscard { * * Will never discard any pixels. */ - bool should_discard(const TransformUserData &UNUSED(user_data), - const float UNUSED(uv[2])) override + bool should_discard(const TransformUserData & /*user_data*/, const float UNUSED(uv[2])) override { return false; } @@ -216,12 +215,12 @@ class BaseUVWrapping { */ class PassThroughUV : public BaseUVWrapping { public: - float modify_u(const ImBuf *UNUSED(source_buffer), float u) override + float modify_u(const ImBuf * /*source_buffer*/, float u) override { return u; } - float modify_v(const ImBuf *UNUSED(source_buffer), float v) override + float modify_v(const ImBuf * /*source_buffer*/, float v) override { return v; } diff --git a/source/blender/io/alembic/intern/abc_reader_object.cc b/source/blender/io/alembic/intern/abc_reader_object.cc index 5cf1fda0db2..af26565f8d6 100644 --- a/source/blender/io/alembic/intern/abc_reader_object.cc +++ b/source/blender/io/alembic/intern/abc_reader_object.cc @@ -133,11 +133,11 @@ Imath::M44d get_matrix(const IXformSchema &schema, const chrono_t time) } struct Mesh *AbcObjectReader::read_mesh(struct Mesh *existing_mesh, - const Alembic::Abc::ISampleSelector &UNUSED(sample_sel), - int UNUSED(read_flag), - const char *UNUSED(velocity_name), - const float UNUSED(velocity_scale), - const char **UNUSED(err_str)) + const Alembic::Abc::ISampleSelector & /*sample_sel*/, + int /*read_flag*/, + const char * /*velocity_name*/, + const float /*velocity_scale*/, + const char ** /*err_str*/) { return existing_mesh; } diff --git a/source/blender/io/alembic/intern/abc_reader_transform.cc b/source/blender/io/alembic/intern/abc_reader_transform.cc index 0d3227fc718..71682531378 100644 --- a/source/blender/io/alembic/intern/abc_reader_transform.cc +++ b/source/blender/io/alembic/intern/abc_reader_transform.cc @@ -55,7 +55,7 @@ bool AbcEmptyReader::accepts_object_type( return true; } -void AbcEmptyReader::readObjectData(Main *bmain, const ISampleSelector &UNUSED(sample_sel)) +void AbcEmptyReader::readObjectData(Main *bmain, const ISampleSelector & /*sample_sel*/) { m_object = BKE_object_add_only_object(bmain, OB_EMPTY, m_object_name.c_str()); m_object->data = nullptr; diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc index 463032ebb9d..ddd72f816b0 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc @@ -37,7 +37,7 @@ namespace blender ::io ::gpencil { -static void error_handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void *UNUSED(user_data)) +static void error_handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void * /*user_data*/) { printf("ERROR: error_no=%04X, detail_no=%u\n", (HPDF_UINT)error_no, (HPDF_UINT)detail_no); } diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc index 51261c4d91e..fbfda975055 100644 --- a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc +++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc @@ -141,7 +141,7 @@ AbstractHierarchyWriter *USDHierarchyIterator::create_hair_writer(const Hierarch } AbstractHierarchyWriter *USDHierarchyIterator::create_particle_writer( - const HierarchyContext *UNUSED(context)) + const HierarchyContext * /*context*/) { return nullptr; } diff --git a/source/blender/io/usd/intern/usd_writer_hair.cc b/source/blender/io/usd/intern/usd_writer_hair.cc index 478a9e26274..8ec1447b505 100644 --- a/source/blender/io/usd/intern/usd_writer_hair.cc +++ b/source/blender/io/usd/intern/usd_writer_hair.cc @@ -64,7 +64,7 @@ void USDHairWriter::do_write(HierarchyContext &context) } } -bool USDHairWriter::check_is_animated(const HierarchyContext &UNUSED(context)) const +bool USDHairWriter::check_is_animated(const HierarchyContext & /*context*/) const { return true; } diff --git a/source/blender/makesrna/intern/rna_path.cc b/source/blender/makesrna/intern/rna_path.cc index e555368561b..e3898bbd682 100644 --- a/source/blender/makesrna/intern/rna_path.cc +++ b/source/blender/makesrna/intern/rna_path.cc @@ -583,7 +583,7 @@ bool RNA_path_resolve_elements(PointerRNA *ptr, const char *path, ListBase *r_el } char *RNA_path_append(const char *path, - const PointerRNA *UNUSED(ptr), + const PointerRNA * /*ptr*/, PropertyRNA *prop, int intkey, const char *strkey) @@ -1333,7 +1333,7 @@ char *RNA_path_struct_property_py(PointerRNA *ptr, PropertyRNA *prop, int index) return ret; } -char *RNA_path_property_py(const PointerRNA *UNUSED(ptr), PropertyRNA *prop, int index) +char *RNA_path_property_py(const PointerRNA * /*ptr*/, PropertyRNA *prop, int index) { const bool is_rna = (prop->magic == RNA_MAGIC); const char *propname = RNA_property_identifier(prop); diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index 7316baebfb6..7ad49f43e1b 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -78,9 +78,7 @@ static void initData(ModifierData *md) MEMCPY_STRUCT_AFTER(bmd, DNA_struct_default_get(BooleanModifierData), modifier); } -static bool isDisabled(const struct Scene *UNUSED(scene), - ModifierData *md, - bool UNUSED(useRenderParams)) +static bool isDisabled(const struct Scene * /*scene*/, ModifierData *md, bool /*useRenderParams*/) { BooleanModifierData *bmd = (BooleanModifierData *)md; Collection *col = bmd->collection; @@ -169,7 +167,7 @@ static Mesh *get_quick_mesh( /** * Compare selected/unselected. */ -static int bm_face_isect_pair(BMFace *f, void *UNUSED(user_data)) +static int bm_face_isect_pair(BMFace *f, void * /*user_data*/) { return BM_elem_flag_test(f, BM_FACE_TAG) ? 1 : 0; } @@ -570,14 +568,14 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * return result; } -static void requiredDataMask(ModifierData *UNUSED(md), CustomData_MeshMasks *r_cddata_masks) +static void requiredDataMask(ModifierData * /*md*/, CustomData_MeshMasks *r_cddata_masks) { r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT; r_cddata_masks->emask |= CD_MASK_MEDGE; r_cddata_masks->fmask |= CD_MASK_MTFACE; } -static void panel_draw(const bContext *UNUSED(C), Panel *panel) +static void panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr); @@ -599,7 +597,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel) modifier_panel_end(layout, ptr); } -static void solver_options_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void solver_options_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr); diff --git a/source/blender/modifiers/intern/MOD_datatransfer.cc b/source/blender/modifiers/intern/MOD_datatransfer.cc index 2a686c772ea..4b6170598dd 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.cc +++ b/source/blender/modifiers/intern/MOD_datatransfer.cc @@ -133,9 +133,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte } } -static bool isDisabled(const struct Scene *UNUSED(scene), - ModifierData *md, - bool UNUSED(useRenderParams)) +static bool isDisabled(const struct Scene * /*scene*/, ModifierData *md, bool /*useRenderParams*/) { /* If no source object, bypass. */ DataTransferModifierData *dtmd = (DataTransferModifierData *)md; @@ -231,7 +229,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * return result; } -static void panel_draw(const bContext *UNUSED(C), Panel *panel) +static void panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *sub, *row; uiLayout *layout = panel->layout; @@ -264,7 +262,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel) modifier_panel_end(layout, ptr); } -static void vertex_panel_draw_header(const bContext *UNUSED(C), Panel *panel) +static void vertex_panel_draw_header(const bContext * /*C*/, Panel *panel) { PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr); uiLayout *layout = panel->layout; @@ -272,7 +270,7 @@ static void vertex_panel_draw_header(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "use_vert_data", 0, nullptr, ICON_NONE); } -static void vertex_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void vertex_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -288,7 +286,7 @@ static void vertex_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "vert_mapping", 0, IFACE_("Mapping"), ICON_NONE); } -static void vertex_vgroup_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void vertex_vgroup_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -302,7 +300,7 @@ static void vertex_vgroup_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "layers_vgroup_select_dst", 0, IFACE_("Layer Mapping"), ICON_NONE); } -static void edge_panel_draw_header(const bContext *UNUSED(C), Panel *panel) +static void edge_panel_draw_header(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -311,7 +309,7 @@ static void edge_panel_draw_header(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "use_edge_data", 0, nullptr, ICON_NONE); } -static void edge_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void edge_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -326,7 +324,7 @@ static void edge_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "edge_mapping", 0, IFACE_("Mapping"), ICON_NONE); } -static void face_corner_panel_draw_header(const bContext *UNUSED(C), Panel *panel) +static void face_corner_panel_draw_header(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -335,7 +333,7 @@ static void face_corner_panel_draw_header(const bContext *UNUSED(C), Panel *pane uiItemR(layout, ptr, "use_loop_data", 0, nullptr, ICON_NONE); } -static void face_corner_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void face_corner_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -350,7 +348,7 @@ static void face_corner_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "loop_mapping", 0, IFACE_("Mapping"), ICON_NONE); } -static void vert_vcol_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void vert_vcol_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -366,7 +364,7 @@ static void vert_vcol_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "layers_vcol_vert_select_dst", 0, IFACE_("Layer Mapping"), ICON_NONE); } -static void face_corner_vcol_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void face_corner_vcol_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -382,7 +380,7 @@ static void face_corner_vcol_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "layers_vcol_loop_select_dst", 0, IFACE_("Layer Mapping"), ICON_NONE); } -static void face_corner_uv_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void face_corner_uv_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -397,7 +395,7 @@ static void face_corner_uv_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "islands_precision", 0, nullptr, ICON_NONE); } -static void face_panel_draw_header(const bContext *UNUSED(C), Panel *panel) +static void face_panel_draw_header(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -406,7 +404,7 @@ static void face_panel_draw_header(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "use_poly_data", 0, nullptr, ICON_NONE); } -static void face_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void face_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -421,7 +419,7 @@ static void face_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "poly_mapping", 0, IFACE_("Mapping"), ICON_NONE); } -static void advanced_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void advanced_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *row, *sub; uiLayout *layout = panel->layout; diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index 6adf36cc184..7fabd5c65fa 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -64,7 +64,7 @@ static void initData(ModifierData *md) MEMCPY_STRUCT_AFTER(mmd, DNA_struct_default_get(MaskModifierData), modifier); } -static void requiredDataMask(ModifierData *UNUSED(md), CustomData_MeshMasks *r_cddata_masks) +static void requiredDataMask(ModifierData * /*md*/, CustomData_MeshMasks *r_cddata_masks) { r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT; } @@ -636,7 +636,7 @@ static void add_interpolated_polys_to_new_mesh(const Mesh &src_mesh, * 2. Find edges and polygons only using those vertices. * 3. Create a new mesh that only uses the found vertices, edges and polygons. */ -static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx), Mesh *mesh) +static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext * /*ctx*/, Mesh *mesh) { MaskModifierData *mmd = reinterpret_cast(md); const bool invert_mask = mmd->flag & MOD_MASK_INV; @@ -779,9 +779,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx) return result; } -static bool isDisabled(const struct Scene *UNUSED(scene), - ModifierData *md, - bool UNUSED(useRenderParams)) +static bool isDisabled(const struct Scene * /*scene*/, ModifierData *md, bool /*useRenderParams*/) { MaskModifierData *mmd = reinterpret_cast(md); @@ -793,7 +791,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene), return mmd->ob_arm && mmd->ob_arm->type != OB_ARMATURE; } -static void panel_draw(const bContext *UNUSED(C), Panel *panel) +static void panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *sub, *row; uiLayout *layout = panel->layout; diff --git a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc index 0471beadcc1..cad9fdfe30d 100644 --- a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc +++ b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc @@ -75,7 +75,7 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u walk(userData, ob, (ID **)&mvmd->object, IDWALK_CB_NOP); } -static void panel_draw(const bContext *UNUSED(C), Panel *panel) +static void panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc index 82098aa1358..13931179b35 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc @@ -98,9 +98,7 @@ static void freeData(ModifierData *md) } } -static bool isDisabled(const struct Scene *UNUSED(scene), - ModifierData *md, - bool UNUSED(useRenderParams)) +static bool isDisabled(const struct Scene * /*scene*/, ModifierData *md, bool /*useRenderParams*/) { MeshSeqCacheModifierData *mcmd = reinterpret_cast(md); @@ -305,7 +303,7 @@ static void panel_draw(const bContext *C, Panel *panel) modifier_panel_end(layout, ptr); } -static void velocity_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void velocity_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -322,7 +320,7 @@ static void velocity_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "velocity_scale", 0, nullptr, ICON_NONE); } -static void time_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void time_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -391,7 +389,7 @@ static void panelRegister(ARegionType *region_type) panel_type); } -static void blendRead(BlendDataReader *UNUSED(reader), ModifierData *md) +static void blendRead(BlendDataReader * /*reader*/, ModifierData *md) { MeshSeqCacheModifierData *msmcd = reinterpret_cast(md); msmcd->reader = nullptr; diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index ba4c03f68de..b66312d6706 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -349,7 +349,7 @@ static bool check_tree_for_time_node(const bNodeTree &tree, return false; } -static bool dependsOnTime(struct Scene *UNUSED(scene), ModifierData *md) +static bool dependsOnTime(struct Scene * /*scene*/, ModifierData *md) { const NodesModifierData *nmd = reinterpret_cast(md); const bNodeTree *tree = nmd->node_group; @@ -387,9 +387,7 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void walk(userData, ob, md, "texture"); } -static bool isDisabled(const struct Scene *UNUSED(scene), - ModifierData *md, - bool UNUSED(useRenderParams)) +static bool isDisabled(const struct Scene * /*scene*/, ModifierData *md, bool /*useRenderParams*/) { NodesModifierData *nmd = reinterpret_cast(md); @@ -1733,7 +1731,7 @@ static void output_attribute_panel_draw(const bContext *C, Panel *panel) } } -static void internal_dependencies_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void internal_dependencies_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; @@ -1821,7 +1819,7 @@ static void panelRegister(ARegionType *region_type) panel_type); } -static void blendWrite(BlendWriter *writer, const ID *UNUSED(id_owner), const ModifierData *md) +static void blendWrite(BlendWriter *writer, const ID * /*id_owner*/, const ModifierData *md) { const NodesModifierData *nmd = reinterpret_cast(md); @@ -1872,7 +1870,7 @@ static void freeData(ModifierData *md) clear_runtime_data(nmd); } -static void requiredDataMask(ModifierData *UNUSED(md), CustomData_MeshMasks *r_cddata_masks) +static void requiredDataMask(ModifierData * /*md*/, CustomData_MeshMasks *r_cddata_masks) { /* We don't know what the node tree will need. If there are vertex groups, it is likely that the * node tree wants to access them. */ diff --git a/source/blender/modifiers/intern/MOD_normal_edit.cc b/source/blender/modifiers/intern/MOD_normal_edit.cc index 1ee4b559e68..f1d0d8487f7 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.cc +++ b/source/blender/modifiers/intern/MOD_normal_edit.cc @@ -209,7 +209,7 @@ static bool polygons_check_flip(MLoop *mloop, } static void normalEditModifier_do_radial(NormalEditModifierData *enmd, - const ModifierEvalContext *UNUSED(ctx), + const ModifierEvalContext * /*ctx*/, Object *ob, Mesh *mesh, short (*clnors)[2], @@ -348,7 +348,7 @@ static void normalEditModifier_do_radial(NormalEditModifierData *enmd, } static void normalEditModifier_do_directional(NormalEditModifierData *enmd, - const ModifierEvalContext *UNUSED(ctx), + const ModifierEvalContext * /*ctx*/, Object *ob, Mesh *mesh, short (*clnors)[2], @@ -649,7 +649,7 @@ static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_ma } } -static bool dependsOnNormals(ModifierData *UNUSED(md)) +static bool dependsOnNormals(ModifierData * /*md*/) { return true; } @@ -661,9 +661,7 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u walk(userData, ob, (ID **)&enmd->target, IDWALK_CB_NOP); } -static bool isDisabled(const struct Scene *UNUSED(scene), - ModifierData *md, - bool UNUSED(useRenderParams)) +static bool isDisabled(const struct Scene * /*scene*/, ModifierData *md, bool /*useRenderParams*/) { NormalEditModifierData *enmd = (NormalEditModifierData *)md; @@ -684,7 +682,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * return normalEditModifier_do((NormalEditModifierData *)md, ctx, ctx->object, mesh); } -static void panel_draw(const bContext *UNUSED(C), Panel *panel) +static void panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *col; uiLayout *layout = panel->layout; @@ -708,7 +706,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel) } /* This panel could be open by default, but it isn't currently. */ -static void mix_mode_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void mix_mode_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *row; uiLayout *layout = panel->layout; @@ -733,7 +731,7 @@ static void mix_mode_panel_draw(const bContext *UNUSED(C), Panel *panel) (RNA_boolean_get(ptr, "no_polynors_fix") ? ICON_LOCKED : ICON_UNLOCKED)); } -static void offset_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void offset_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; diff --git a/source/blender/modifiers/intern/MOD_particlesystem.cc b/source/blender/modifiers/intern/MOD_particlesystem.cc index 0a7d2324fde..b957bd26ca6 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.cc +++ b/source/blender/modifiers/intern/MOD_particlesystem.cc @@ -249,7 +249,7 @@ static void deformVertsEM(ModifierData *md, } #endif -static void panel_draw(const bContext *UNUSED(C), Panel *panel) +static void panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; diff --git a/source/blender/modifiers/intern/MOD_subsurf.cc b/source/blender/modifiers/intern/MOD_subsurf.cc index ab2f07513d2..c95368ba442 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.cc +++ b/source/blender/modifiers/intern/MOD_subsurf.cc @@ -462,7 +462,7 @@ static void panelRegister(ARegionType *region_type) region_type, "advanced", "Advanced", nullptr, advanced_panel_draw, panel_type); } -static void blendRead(BlendDataReader *UNUSED(reader), ModifierData *md) +static void blendRead(BlendDataReader * /*reader*/, ModifierData *md) { SubsurfModifierData *smd = (SubsurfModifierData *)md; diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc index f5a4b98a53e..e66793d7cce 100644 --- a/source/blender/modifiers/intern/MOD_volume_displace.cc +++ b/source/blender/modifiers/intern/MOD_volume_displace.cc @@ -84,7 +84,7 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void walk(userData, ob, md, "texture"); } -static bool dependsOnTime(struct Scene *UNUSED(scene), ModifierData *md) +static bool dependsOnTime(struct Scene * /*scene*/, ModifierData *md) { VolumeDisplaceModifierData *vdmd = reinterpret_cast(md); if (vdmd->texture) { diff --git a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc index e90967838d3..35fd5a4af42 100644 --- a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc +++ b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc @@ -77,7 +77,7 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u walk(userData, ob, (ID **)&vmmd->object, IDWALK_CB_NOP); } -static void panel_draw(const bContext *UNUSED(C), Panel *panel) +static void panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; diff --git a/source/blender/modifiers/intern/MOD_wave.cc b/source/blender/modifiers/intern/MOD_wave.cc index 0fc2d76f87e..962bb60c8ad 100644 --- a/source/blender/modifiers/intern/MOD_wave.cc +++ b/source/blender/modifiers/intern/MOD_wave.cc @@ -55,7 +55,7 @@ static void initData(ModifierData *md) MEMCPY_STRUCT_AFTER(wmd, DNA_struct_default_get(WaveModifierData), modifier); } -static bool dependsOnTime(Scene *UNUSED(scene), ModifierData *UNUSED(md)) +static bool dependsOnTime(Scene * /*scene*/, ModifierData * /*md*/) { return true; } @@ -346,7 +346,7 @@ static void deformVertsEM(ModifierData *md, } } -static void panel_draw(const bContext *UNUSED(C), Panel *panel) +static void panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *sub, *row, *col; uiLayout *layout = panel->layout; @@ -383,7 +383,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel) modifier_panel_end(layout, ptr); } -static void position_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void position_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *col; uiLayout *layout = panel->layout; @@ -399,7 +399,7 @@ static void position_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(col, ptr, "start_position_y", 0, "Y", ICON_NONE); } -static void time_panel_draw(const bContext *UNUSED(C), Panel *panel) +static void time_panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *col; uiLayout *layout = panel->layout; diff --git a/source/blender/modifiers/intern/MOD_weld.cc b/source/blender/modifiers/intern/MOD_weld.cc index ef6d561fa00..bbd440f377e 100644 --- a/source/blender/modifiers/intern/MOD_weld.cc +++ b/source/blender/modifiers/intern/MOD_weld.cc @@ -127,7 +127,7 @@ static std::optional calculate_weld(const Mesh &mesh, const WeldModifier return nullptr; } -static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx), Mesh *mesh) +static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext * /*ctx*/, Mesh *mesh) { const WeldModifierData &wmd = reinterpret_cast(*md); @@ -157,7 +157,7 @@ static void requiredDataMask(ModifierData *md, CustomData_MeshMasks *r_cddata_ma } } -static void panel_draw(const bContext *UNUSED(C), Panel *panel) +static void panel_draw(const bContext * /*C*/, Panel *panel) { uiLayout *layout = panel->layout; diff --git a/source/blender/nodes/composite/node_composite_tree.cc b/source/blender/nodes/composite/node_composite_tree.cc index 9792c55b590..37d4fe852be 100644 --- a/source/blender/nodes/composite/node_composite_tree.cc +++ b/source/blender/nodes/composite/node_composite_tree.cc @@ -36,11 +36,8 @@ # include "COM_compositor.h" #endif -static void composite_get_from_context(const bContext *C, - bNodeTreeType *UNUSED(treetype), - bNodeTree **r_ntree, - ID **r_id, - ID **r_from) +static void composite_get_from_context( + const bContext *C, bNodeTreeType * /*treetype*/, bNodeTree **r_ntree, ID **r_id, ID **r_from) { Scene *scene = CTX_data_scene(C); @@ -49,7 +46,7 @@ static void composite_get_from_context(const bContext *C, *r_ntree = scene->nodetree; } -static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCallback func) +static void foreach_nodeclass(Scene * /*scene*/, void *calldata, bNodeClassCallback func) { func(calldata, NODE_CLASS_INPUT, N_("Input")); func(calldata, NODE_CLASS_OUTPUT, N_("Output")); @@ -64,7 +61,7 @@ static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCa func(calldata, NODE_CLASS_LAYOUT, N_("Layout")); } -static void free_node_cache(bNodeTree *UNUSED(ntree), bNode *node) +static void free_node_cache(bNodeTree * /*ntree*/, bNode *node) { LISTBASE_FOREACH (bNodeSocket *, sock, &node->outputs) { if (sock->cache) { @@ -158,7 +155,7 @@ static void update(bNodeTree *ntree) ntree_update_reroute_nodes(ntree); } -static void composite_node_add_init(bNodeTree *UNUSED(bnodetree), bNode *bnode) +static void composite_node_add_init(bNodeTree * /*bnodetree*/, bNode *bnode) { /* Composite node will only show previews for input classes * by default, other will be hidden @@ -168,7 +165,7 @@ static void composite_node_add_init(bNodeTree *UNUSED(bnodetree), bNode *bnode) } } -static bool composite_node_tree_socket_type_valid(bNodeTreeType *UNUSED(ntreetype), +static bool composite_node_tree_socket_type_valid(bNodeTreeType * /*ntreetype*/, bNodeSocketType *socket_type) { return nodeIsStaticSocketType(socket_type) && diff --git a/source/blender/nodes/composite/node_composite_util.cc b/source/blender/nodes/composite/node_composite_util.cc index 575a32b1785..ae3352c0d1b 100644 --- a/source/blender/nodes/composite/node_composite_util.cc +++ b/source/blender/nodes/composite/node_composite_util.cc @@ -9,9 +9,7 @@ #include "node_composite_util.hh" -bool cmp_node_poll_default(bNodeType *UNUSED(ntype), - bNodeTree *ntree, - const char **r_disabled_hint) +bool cmp_node_poll_default(bNodeType * /*ntype*/, bNodeTree *ntree, const char **r_disabled_hint) { if (!STREQ(ntree->idname, "CompositorNodeTree")) { *r_disabled_hint = TIP_("Not a compositor node tree"); @@ -20,7 +18,7 @@ bool cmp_node_poll_default(bNodeType *UNUSED(ntype), return true; } -void cmp_node_update_default(bNodeTree *UNUSED(ntree), bNode *node) +void cmp_node_update_default(bNodeTree * /*ntree*/, bNode *node) { LISTBASE_FOREACH (bNodeSocket *, sock, &node->outputs) { if (sock->cache) { diff --git a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc index 12f81da3d1c..e2f4e80270e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc +++ b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc @@ -37,12 +37,12 @@ static void cmp_node_alphaover_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_alphaover_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_alphaover_init(bNodeTree * /*ntree*/, bNode *node) { node->storage = MEM_cnew(__func__); } -static void node_composit_buts_alphaover(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_alphaover(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc index 55fe3366526..25fefd33199 100644 --- a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc +++ b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc @@ -22,7 +22,7 @@ static void cmp_node_antialiasing_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_antialiasing(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_antialiasing(bNodeTree * /*ntree*/, bNode *node) { NodeAntiAliasingData *data = MEM_cnew(__func__); @@ -33,7 +33,7 @@ static void node_composit_init_antialiasing(bNodeTree *UNUSED(ntree), bNode *nod node->storage = data; } -static void node_composit_buts_antialiasing(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_antialiasing(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc index ac9a6c89aa4..af7581d845f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc @@ -34,7 +34,7 @@ static void cmp_node_bilateralblur_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_bilateralblur(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_bilateralblur(bNodeTree * /*ntree*/, bNode *node) { NodeBilateralBlurData *nbbd = MEM_cnew(__func__); node->storage = nbbd; @@ -43,9 +43,7 @@ static void node_composit_init_bilateralblur(bNodeTree *UNUSED(ntree), bNode *no nbbd->sigma_space = 5.0; } -static void node_composit_buts_bilateralblur(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) +static void node_composit_buts_bilateralblur(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.cc b/source/blender/nodes/composite/nodes/node_composite_blur.cc index af7dca32c0d..a9372bdcfb7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_blur.cc @@ -42,14 +42,14 @@ static void cmp_node_blur_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_blur(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_blur(bNodeTree * /*ntree*/, bNode *node) { NodeBlurData *data = MEM_cnew(__func__); data->filtertype = R_FILTER_GAUSS; node->storage = data; } -static void node_composit_buts_blur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_blur(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col, *row; diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc index 9c0617ee8c3..731c559dfdc 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc @@ -43,13 +43,13 @@ static void cmp_node_bokehblur_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_bokehblur(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_bokehblur(bNodeTree * /*ntree*/, bNode *node) { node->custom3 = 4.0f; node->custom4 = 16.0f; } -static void node_composit_buts_bokehblur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_bokehblur(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "use_variable_size", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); // uiItemR(layout, ptr, "f_stop", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); /* UNUSED */ diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc index 81cc8990d35..eb35b933d1b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc @@ -29,7 +29,7 @@ static void cmp_node_bokehimage_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_bokehimage(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_bokehimage(bNodeTree * /*ntree*/, bNode *node) { NodeBokehImage *data = MEM_cnew(__func__); data->angle = 0.0f; @@ -40,7 +40,7 @@ static void node_composit_init_bokehimage(bNodeTree *UNUSED(ntree), bNode *node) node->storage = data; } -static void node_composit_buts_bokehimage(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_bokehimage(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "flaps", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); uiItemR(layout, ptr, "angle", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc index 3cf0932e1b3..668dc9d92de 100644 --- a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc @@ -32,7 +32,7 @@ static void cmp_node_boxmask_declare(NodeDeclarationBuilder &b) b.add_output(N_("Mask")); } -static void node_composit_init_boxmask(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_boxmask(bNodeTree * /*ntree*/, bNode *node) { NodeBoxMask *data = MEM_cnew(__func__); data->x = 0.5; @@ -43,7 +43,7 @@ static void node_composit_init_boxmask(bNodeTree *UNUSED(ntree), bNode *node) node->storage = data; } -static void node_composit_buts_boxmask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_boxmask(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *row; diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.cc b/source/blender/nodes/composite/nodes/node_composite_brightness.cc index fa22f551de6..6b9fef75524 100644 --- a/source/blender/nodes/composite/nodes/node_composite_brightness.cc +++ b/source/blender/nodes/composite/nodes/node_composite_brightness.cc @@ -28,14 +28,12 @@ static void cmp_node_brightcontrast_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_brightcontrast(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_brightcontrast(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = 1; } -static void node_composit_buts_brightcontrast(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) +static void node_composit_buts_brightcontrast(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "use_premultiply", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc index 3b825017da8..2fd2d6c8f71 100644 --- a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc @@ -31,7 +31,7 @@ static void cmp_node_channel_matte_declare(NodeDeclarationBuilder &b) b.add_output(N_("Matte")); } -static void node_composit_init_channel_matte(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_channel_matte(bNodeTree * /*ntree*/, bNode *node) { NodeChroma *c = MEM_cnew(__func__); node->storage = c; @@ -46,9 +46,7 @@ static void node_composit_init_channel_matte(bNodeTree *UNUSED(ntree), bNode *no node->custom2 = 2; /* Green Channel. */ } -static void node_composit_buts_channel_matte(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) +static void node_composit_buts_channel_matte(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col, *row; diff --git a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc index e5ce87169d4..e2ef96ea95e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc @@ -36,7 +36,7 @@ static void cmp_node_chroma_matte_declare(NodeDeclarationBuilder &b) b.add_output(N_("Matte")); } -static void node_composit_init_chroma_matte(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_chroma_matte(bNodeTree * /*ntree*/, bNode *node) { NodeChroma *c = MEM_cnew(__func__); node->storage = c; @@ -47,7 +47,7 @@ static void node_composit_init_chroma_matte(bNodeTree *UNUSED(ntree), bNode *nod c->fstrength = 1.0f; } -static void node_composit_buts_chroma_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_chroma_matte(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc index 08329601f14..2a20a4d995f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc @@ -32,7 +32,7 @@ static void cmp_node_color_matte_declare(NodeDeclarationBuilder &b) b.add_output(N_("Matte")); } -static void node_composit_init_color_matte(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_color_matte(bNodeTree * /*ntree*/, bNode *node) { NodeChroma *c = MEM_cnew(__func__); node->storage = c; @@ -43,7 +43,7 @@ static void node_composit_init_color_matte(bNodeTree *UNUSED(ntree), bNode *node c->fstrength = 1.0f; } -static void node_composit_buts_color_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_color_matte(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc index 29401d7b20f..ba829da83ed 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc @@ -36,7 +36,7 @@ static void cmp_node_color_spill_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_color_spill(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_color_spill(bNodeTree * /*ntree*/, bNode *node) { NodeColorspill *ncs = MEM_cnew(__func__); node->storage = ncs; @@ -47,7 +47,7 @@ static void node_composit_init_color_spill(bNodeTree *UNUSED(ntree), bNode *node ncs->unspill = 0; /* do not use unspill */ } -static void node_composit_buts_color_spill(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_color_spill(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *row, *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc index e05fbf00a25..3300896bfdf 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc @@ -23,7 +23,7 @@ * (sRGB conversion happens for LGG), * but this keeps settings comparable. */ -void ntreeCompositColorBalanceSyncFromLGG(bNodeTree *UNUSED(ntree), bNode *node) +void ntreeCompositColorBalanceSyncFromLGG(bNodeTree * /*ntree*/, bNode *node) { NodeColorBalance *n = (NodeColorBalance *)node->storage; @@ -34,7 +34,7 @@ void ntreeCompositColorBalanceSyncFromLGG(bNodeTree *UNUSED(ntree), bNode *node) } } -void ntreeCompositColorBalanceSyncFromCDL(bNodeTree *UNUSED(ntree), bNode *node) +void ntreeCompositColorBalanceSyncFromCDL(bNodeTree * /*ntree*/, bNode *node) { NodeColorBalance *n = (NodeColorBalance *)node->storage; @@ -64,7 +64,7 @@ static void cmp_node_colorbalance_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_colorbalance(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_colorbalance(bNodeTree * /*ntree*/, bNode *node) { NodeColorBalance *n = MEM_cnew(__func__); @@ -78,7 +78,7 @@ static void node_composit_init_colorbalance(bNodeTree *UNUSED(ntree), bNode *nod node->storage = n; } -static void node_composit_buts_colorbalance(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_colorbalance(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *split, *col, *row; @@ -123,9 +123,7 @@ static void node_composit_buts_colorbalance(uiLayout *layout, bContext *UNUSED(C } } -static void node_composit_buts_colorbalance_ex(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) +static void node_composit_buts_colorbalance_ex(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "correction_method", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc index 92b10fc1877..c6051a42df6 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc @@ -35,7 +35,7 @@ static void cmp_node_colorcorrection_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_colorcorrection(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_colorcorrection(bNodeTree * /*ntree*/, bNode *node) { NodeColorCorrection *n = MEM_cnew(__func__); n->startmidtones = 0.2f; @@ -64,9 +64,7 @@ static void node_composit_init_colorcorrection(bNodeTree *UNUSED(ntree), bNode * node->storage = n; } -static void node_composit_buts_colorcorrection(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) +static void node_composit_buts_colorcorrection(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *row; @@ -155,7 +153,7 @@ static void node_composit_buts_colorcorrection(uiLayout *layout, } static void node_composit_buts_colorcorrection_ex(uiLayout *layout, - bContext *UNUSED(C), + bContext * /*C*/, PointerRNA *ptr) { uiLayout *row; diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.cc b/source/blender/nodes/composite/nodes/node_composite_composite.cc index 68061bb434d..24fe4e2d986 100644 --- a/source/blender/nodes/composite/nodes/node_composite_composite.cc +++ b/source/blender/nodes/composite/nodes/node_composite_composite.cc @@ -30,7 +30,7 @@ static void cmp_node_composite_declare(NodeDeclarationBuilder &b) b.add_input(N_("Z")).default_value(1.0f).min(0.0f).max(1.0f); } -static void node_composit_buts_composite(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_composite(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "use_alpha", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc b/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc index e36da39cca1..3e521144b8d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc +++ b/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc @@ -24,7 +24,7 @@ static void CMP_NODE_CONVERT_COLOR_SPACE_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_convert_colorspace(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_convert_colorspace(bNodeTree * /*ntree*/, bNode *node) { NodeConvertColorSpace *ncs = static_cast( MEM_callocN(sizeof(NodeConvertColorSpace), "node colorspace")); @@ -42,7 +42,7 @@ static void node_composit_init_convert_colorspace(bNodeTree *UNUSED(ntree), bNod } static void node_composit_buts_convert_colorspace(uiLayout *layout, - bContext *UNUSED(C), + bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "from_color_space", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.cc b/source/blender/nodes/composite/nodes/node_composite_crop.cc index 13d02a707be..96a5443921b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_crop.cc +++ b/source/blender/nodes/composite/nodes/node_composite_crop.cc @@ -37,7 +37,7 @@ static void cmp_node_crop_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_crop(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_crop(bNodeTree * /*ntree*/, bNode *node) { NodeTwoXYs *nxy = MEM_cnew(__func__); node->storage = nxy; @@ -47,7 +47,7 @@ static void node_composit_init_crop(bNodeTree *UNUSED(ntree), bNode *node) nxy->y2 = 0; } -static void node_composit_buts_crop(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_crop(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc index 7e5544381a4..23a9385c4fc 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc @@ -234,7 +234,7 @@ static bNodeSocketTemplate cmp_node_cryptomatte_out[] = { {-1, ""}, }; -static void node_init_cryptomatte(bNodeTree *UNUSED(ntree), bNode *node) +static void node_init_cryptomatte(bNodeTree * /*ntree*/, bNode *node) { NodeCryptomatte *user = MEM_cnew(__func__); node->storage = user; @@ -262,7 +262,7 @@ static void node_free_cryptomatte(bNode *node) } } -static void node_copy_cryptomatte(bNodeTree *UNUSED(dest_ntree), +static void node_copy_cryptomatte(bNodeTree * /*dst_ntree*/, bNode *dest_node, const bNode *src_node) { @@ -275,7 +275,7 @@ static void node_copy_cryptomatte(bNodeTree *UNUSED(dest_ntree), dest_node->storage = dest_nc; } -static bool node_poll_cryptomatte(bNodeType *UNUSED(ntype), +static bool node_poll_cryptomatte(bNodeType * /*ntype*/, bNodeTree *ntree, const char **r_disabled_hint) { diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.cc b/source/blender/nodes/composite/nodes/node_composite_curves.cc index 70bd4d17007..b631f75e879 100644 --- a/source/blender/nodes/composite/nodes/node_composite_curves.cc +++ b/source/blender/nodes/composite/nodes/node_composite_curves.cc @@ -29,7 +29,7 @@ static void cmp_node_time_declare(NodeDeclarationBuilder &b) } /* custom1 = start_frame, custom2 = end_frame */ -static void node_composit_init_curves_time(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_curves_time(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = 1; node->custom2 = 250; @@ -121,12 +121,12 @@ static void cmp_node_curve_vec_declare(NodeDeclarationBuilder &b) b.add_output(N_("Vector")); } -static void node_composit_init_curve_vec(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_curve_vec(bNodeTree * /*ntree*/, bNode *node) { node->storage = BKE_curvemapping_add(3, -1.0f, -1.0f, 1.0f, 1.0f); } -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); } @@ -222,7 +222,7 @@ static void cmp_node_rgbcurves_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_curve_rgb(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_curve_rgb(bNodeTree * /*ntree*/, bNode *node) { node->storage = BKE_curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f); } diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.cc b/source/blender/nodes/composite/nodes/node_composite_defocus.cc index 94b4908a1bd..197e02bebad 100644 --- a/source/blender/nodes/composite/nodes/node_composite_defocus.cc +++ b/source/blender/nodes/composite/nodes/node_composite_defocus.cc @@ -27,7 +27,7 @@ static void cmp_node_defocus_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_defocus(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_defocus(bNodeTree * /*ntree*/, bNode *node) { /* defocus node */ NodeDefocus *nbd = MEM_cnew(__func__); diff --git a/source/blender/nodes/composite/nodes/node_composite_denoise.cc b/source/blender/nodes/composite/nodes/node_composite_denoise.cc index 0452e7cd943..821b3c23a7b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_denoise.cc +++ b/source/blender/nodes/composite/nodes/node_composite_denoise.cc @@ -28,7 +28,7 @@ static void cmp_node_denoise_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_denonise(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_denonise(bNodeTree * /*ntree*/, bNode *node) { NodeDenoise *ndg = MEM_cnew(__func__); ndg->hdr = true; @@ -36,7 +36,7 @@ static void node_composit_init_denonise(bNodeTree *UNUSED(ntree), bNode *node) node->storage = ndg; } -static void node_composit_buts_denoise(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_denoise(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { #ifndef WITH_OPENIMAGEDENOISE uiItemL(layout, IFACE_("Disabled, built without OpenImageDenoise"), ICON_ERROR); diff --git a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc index aa6725b8750..1e15f9709fe 100644 --- a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc +++ b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc @@ -33,13 +33,13 @@ static void cmp_node_despeckle_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_despeckle(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_despeckle(bNodeTree * /*ntree*/, bNode *node) { node->custom3 = 0.5f; node->custom4 = 0.5f; } -static void node_composit_buts_despeckle(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_despeckle(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc index 8912d00a9be..cde537f7d4c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc @@ -32,7 +32,7 @@ static void cmp_node_diff_matte_declare(NodeDeclarationBuilder &b) b.add_output(N_("Matte")); } -static void node_composit_init_diff_matte(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_diff_matte(bNodeTree * /*ntree*/, bNode *node) { NodeChroma *c = MEM_cnew(__func__); node->storage = c; @@ -40,7 +40,7 @@ static void node_composit_init_diff_matte(bNodeTree *UNUSED(ntree), bNode *node) c->t2 = 0.1f; } -static void node_composit_buts_diff_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_diff_matte(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_dilate.cc b/source/blender/nodes/composite/nodes/node_composite_dilate.cc index 0cf0c5cc80b..d659c46721d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_dilate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_dilate.cc @@ -41,14 +41,14 @@ static void cmp_node_dilate_declare(NodeDeclarationBuilder &b) b.add_output(N_("Mask")); } -static void node_composit_init_dilateerode(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_dilateerode(bNodeTree * /*ntree*/, bNode *node) { NodeDilateErode *data = MEM_cnew(__func__); data->falloff = PROP_SMOOTH; node->storage = data; } -static void node_composit_buts_dilateerode(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_dilateerode(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); uiItemR(layout, ptr, "distance", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); diff --git a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc index 6e6bec70283..a5a253c2cca 100644 --- a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc @@ -32,7 +32,7 @@ static void cmp_node_directional_blur_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_dblur(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_dblur(bNodeTree * /*ntree*/, bNode *node) { NodeDBlurData *ndbd = MEM_cnew(__func__); node->storage = ndbd; @@ -41,7 +41,7 @@ static void node_composit_init_dblur(bNodeTree *UNUSED(ntree), bNode *node) ndbd->center_y = 0.5; } -static void node_composit_buts_dblur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_dblur(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc index 6a786571f43..87b66810fe3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc @@ -32,7 +32,7 @@ static void cmp_node_distance_matte_declare(NodeDeclarationBuilder &b) b.add_output(N_("Matte")); } -static void node_composit_init_distance_matte(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_distance_matte(bNodeTree * /*ntree*/, bNode *node) { NodeChroma *c = MEM_cnew(__func__); node->storage = c; @@ -41,9 +41,7 @@ static void node_composit_init_distance_matte(bNodeTree *UNUSED(ntree), bNode *n c->t2 = 0.1f; } -static void node_composit_buts_distance_matte(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) +static void node_composit_buts_distance_matte(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col, *row; diff --git a/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc b/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc index fec7879ed78..553058cf545 100644 --- a/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc @@ -24,7 +24,7 @@ static void cmp_node_double_edge_mask_declare(NodeDeclarationBuilder &b) } static void node_composit_buts_double_edge_mask(uiLayout *layout, - bContext *UNUSED(C), + bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc index 7c031b354e5..120b4d0d976 100644 --- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc @@ -32,7 +32,7 @@ static void cmp_node_ellipsemask_declare(NodeDeclarationBuilder &b) b.add_output(N_("Mask")); } -static void node_composit_init_ellipsemask(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_ellipsemask(bNodeTree * /*ntree*/, bNode *node) { NodeEllipseMask *data = MEM_cnew(__func__); data->x = 0.5; @@ -43,7 +43,7 @@ static void node_composit_init_ellipsemask(bNodeTree *UNUSED(ntree), bNode *node node->storage = data; } -static void node_composit_buts_ellipsemask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_ellipsemask(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *row; row = uiLayoutRow(layout, true); diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.cc b/source/blender/nodes/composite/nodes/node_composite_filter.cc index bd7b443e17e..816d1009ffe 100644 --- a/source/blender/nodes/composite/nodes/node_composite_filter.cc +++ b/source/blender/nodes/composite/nodes/node_composite_filter.cc @@ -33,7 +33,7 @@ static void cmp_node_filter_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_buts_filter(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_filter(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "filter_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_flip.cc b/source/blender/nodes/composite/nodes/node_composite_flip.cc index aaa2b565ed2..07c96eb4d22 100644 --- a/source/blender/nodes/composite/nodes/node_composite_flip.cc +++ b/source/blender/nodes/composite/nodes/node_composite_flip.cc @@ -31,7 +31,7 @@ static void cmp_node_flip_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_buts_flip(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_flip(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "axis", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_glare.cc b/source/blender/nodes/composite/nodes/node_composite_glare.cc index 33577d5caf8..60d149a32b9 100644 --- a/source/blender/nodes/composite/nodes/node_composite_glare.cc +++ b/source/blender/nodes/composite/nodes/node_composite_glare.cc @@ -22,7 +22,7 @@ static void cmp_node_glare_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_glare(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_glare(bNodeTree * /*ntree*/, bNode *node) { NodeGlare *ndg = MEM_cnew(__func__); ndg->quality = 1; @@ -39,7 +39,7 @@ static void node_composit_init_glare(bNodeTree *UNUSED(ntree), bNode *node) node->storage = ndg; } -static void node_composit_buts_glare(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_glare(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "glare_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); uiItemR(layout, ptr, "quality", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); diff --git a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc index 6333860a19b..a365929138c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc +++ b/source/blender/nodes/composite/nodes/node_composite_huecorrect.cc @@ -31,7 +31,7 @@ static void cmp_node_huecorrect_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_huecorrect(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_huecorrect(bNodeTree * /*ntree*/, bNode *node) { node->storage = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); diff --git a/source/blender/nodes/composite/nodes/node_composite_id_mask.cc b/source/blender/nodes/composite/nodes/node_composite_id_mask.cc index ac8456cb931..a71b3f132c0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_id_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_id_mask.cc @@ -22,7 +22,7 @@ static void cmp_node_idmask_declare(NodeDeclarationBuilder &b) b.add_output(N_("Alpha")); } -static void node_composit_buts_id_mask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_id_mask(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "index", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); uiItemR(layout, ptr, "use_antialiasing", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); diff --git a/source/blender/nodes/composite/nodes/node_composite_image.cc b/source/blender/nodes/composite/nodes/node_composite_image.cc index 4b73c1a62fb..1e9fde2899a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.cc +++ b/source/blender/nodes/composite/nodes/node_composite_image.cc @@ -80,7 +80,7 @@ static void cmp_node_image_add_pass_output(bNodeTree *ntree, const char *passname, int rres_index, eNodeSocketDatatype type, - int UNUSED(is_rlayers), + int /*is_rlayers*/, LinkNodePair *available_sockets, int *prev_index) { @@ -273,8 +273,8 @@ static void cmp_node_rlayer_create_outputs_cb(void *userdata, Scene *scene, ViewLayer *view_layer, const char *name, - int UNUSED(channels), - const char *UNUSED(chanid), + int /*channels*/, + const char * /*chanid*/, eNodeSocketDatatype type) { CreateOutputUserData &data = *(CreateOutputUserData *)userdata; @@ -426,7 +426,7 @@ static void node_composit_free_image(bNode *node) MEM_freeN(node->storage); } -static void node_composit_copy_image(bNodeTree *UNUSED(dest_ntree), +static void node_composit_copy_image(bNodeTree * /*dst_ntree*/, bNode *dest_node, const bNode *src_node) { @@ -710,7 +710,7 @@ static void node_composit_init_rlayers(const bContext *C, PointerRNA *ptr) } } -static bool node_composit_poll_rlayers(bNodeType *UNUSED(ntype), +static bool node_composit_poll_rlayers(bNodeType * /*ntype*/, bNodeTree *ntree, const char **r_disabled_hint) { @@ -749,7 +749,7 @@ static void node_composit_free_rlayers(bNode *node) } } -static void node_composit_copy_rlayers(bNodeTree *UNUSED(dest_ntree), +static void node_composit_copy_rlayers(bNodeTree * /*dst_ntree*/, bNode *dest_node, const bNode *src_node) { diff --git a/source/blender/nodes/composite/nodes/node_composite_inpaint.cc b/source/blender/nodes/composite/nodes/node_composite_inpaint.cc index f6e46bef299..c26021b16bd 100644 --- a/source/blender/nodes/composite/nodes/node_composite_inpaint.cc +++ b/source/blender/nodes/composite/nodes/node_composite_inpaint.cc @@ -22,7 +22,7 @@ static void cmp_node_inpaint_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_buts_inpaint(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_inpaint(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "distance", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_invert.cc b/source/blender/nodes/composite/nodes/node_composite_invert.cc index 4bfcc7b6b9c..bbb2808c4ea 100644 --- a/source/blender/nodes/composite/nodes/node_composite_invert.cc +++ b/source/blender/nodes/composite/nodes/node_composite_invert.cc @@ -32,12 +32,12 @@ static void cmp_node_invert_declare(NodeDeclarationBuilder &b) b.add_output(N_("Color")); } -static void node_composit_init_invert(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_invert(bNodeTree * /*ntree*/, bNode *node) { node->custom1 |= CMP_CHAN_RGB; } -static void node_composit_buts_invert(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_invert(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_keying.cc b/source/blender/nodes/composite/nodes/node_composite_keying.cc index 8b584e216cd..4b61e06a232 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keying.cc +++ b/source/blender/nodes/composite/nodes/node_composite_keying.cc @@ -33,7 +33,7 @@ static void cmp_node_keying_declare(NodeDeclarationBuilder &b) b.add_output(N_("Edges")); } -static void node_composit_init_keying(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_keying(bNodeTree * /*ntree*/, bNode *node) { NodeKeyingData *data = MEM_cnew(__func__); @@ -47,7 +47,7 @@ static void node_composit_init_keying(bNodeTree *UNUSED(ntree), bNode *node) node->storage = data; } -static void node_composit_buts_keying(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_keying(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { /* bNode *node = (bNode*)ptr->data; */ /* UNUSED */ diff --git a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc index 260fccf66d0..1cf482ff6ff 100644 --- a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc +++ b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc @@ -52,14 +52,14 @@ static void cmp_node_lensdist_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_lensdist(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_lensdist(bNodeTree * /*ntree*/, bNode *node) { NodeLensDist *nld = MEM_cnew(__func__); nld->jit = nld->proj = nld->fit = 0; node->storage = nld; } -static void node_composit_buts_lensdist(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_lensdist(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.cc b/source/blender/nodes/composite/nodes/node_composite_levels.cc index 2f1ebeb79b5..a4fe1f33813 100644 --- a/source/blender/nodes/composite/nodes/node_composite_levels.cc +++ b/source/blender/nodes/composite/nodes/node_composite_levels.cc @@ -23,12 +23,12 @@ static void cmp_node_levels_declare(NodeDeclarationBuilder &b) b.add_output(N_("Std Dev")); } -static void node_composit_init_view_levels(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_view_levels(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = 1; /* All channels. */ } -static void node_composit_buts_view_levels(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_view_levels(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "channel", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc index 59ae62ec411..8426efb0f1f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc @@ -31,7 +31,7 @@ static void cmp_node_luma_matte_declare(NodeDeclarationBuilder &b) b.add_output(N_("Matte")); } -static void node_composit_init_luma_matte(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_luma_matte(bNodeTree * /*ntree*/, bNode *node) { NodeChroma *c = MEM_cnew(__func__); node->storage = c; @@ -39,7 +39,7 @@ static void node_composit_init_luma_matte(bNodeTree *UNUSED(ntree), bNode *node) c->t2 = 0.0f; } -static void node_composit_buts_luma_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_luma_matte(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_map_range.cc b/source/blender/nodes/composite/nodes/node_composite_map_range.cc index e72869efa93..0dace651742 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_range.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_range.cc @@ -48,7 +48,7 @@ static void cmp_node_map_range_declare(NodeDeclarationBuilder &b) b.add_output(N_("Value")); } -static void node_composit_buts_map_range(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_map_range(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_map_uv.cc b/source/blender/nodes/composite/nodes/node_composite_map_uv.cc index 4f660d62c3b..86f85ed7031 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_uv.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_uv.cc @@ -23,7 +23,7 @@ static void cmp_node_map_uv_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_buts_map_uv(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_map_uv(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "alpha", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_map_value.cc b/source/blender/nodes/composite/nodes/node_composite_map_value.cc index e30de39605d..eacc003378a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_value.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_value.cc @@ -34,12 +34,12 @@ static void cmp_node_map_value_declare(NodeDeclarationBuilder &b) b.add_output(N_("Value")); } -static void node_composit_init_map_value(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_map_value(bNodeTree * /*ntree*/, bNode *node) { node->storage = BKE_texture_mapping_add(TEXMAP_TYPE_POINT); } -static void node_composit_buts_map_value(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_map_value(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *sub, *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_mask.cc b/source/blender/nodes/composite/nodes/node_composite_mask.cc index 2372dbae3f2..5dfcc9a9ecf 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_mask.cc @@ -23,7 +23,7 @@ static void cmp_node_mask_declare(NodeDeclarationBuilder &b) b.add_output(N_("Mask")); } -static void node_composit_init_mask(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_mask(bNodeTree * /*ntree*/, bNode *node) { NodeMask *data = MEM_cnew(__func__); data->size_x = data->size_y = 256; @@ -33,7 +33,7 @@ static void node_composit_init_mask(bNodeTree *UNUSED(ntree), bNode *node) node->custom3 = 0.5f; /* shutter */ } -static void node_mask_label(const bNodeTree *UNUSED(ntree), +static void node_mask_label(const bNodeTree * /*ntree*/, const bNode *node, char *label, int maxlen) diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc index 88638586594..aad6eb3ce5e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc +++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc @@ -26,7 +26,7 @@ static void cmp_node_moviedistortion_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void label(const bNodeTree *UNUSED(ntree), const bNode *node, char *label, int maxlen) +static void label(const bNodeTree * /*ntree*/, const bNode *node, char *label, int maxlen) { if (node->custom1 == 0) { BLI_strncpy(label, IFACE_("Undistortion"), maxlen); @@ -54,7 +54,7 @@ static void storage_free(bNode *node) node->storage = nullptr; } -static void storage_copy(bNodeTree *UNUSED(dest_ntree), bNode *dest_node, const bNode *src_node) +static void storage_copy(bNodeTree * /*dst_ntree*/, bNode *dest_node, const bNode *src_node) { if (src_node->storage) { dest_node->storage = BKE_tracking_distortion_copy((MovieDistortion *)src_node->storage); diff --git a/source/blender/nodes/composite/nodes/node_composite_output_file.cc b/source/blender/nodes/composite/nodes/node_composite_output_file.cc index 5ed383977a5..f27dec91b1c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_output_file.cc +++ b/source/blender/nodes/composite/nodes/node_composite_output_file.cc @@ -231,9 +231,7 @@ static void free_output_file(bNode *node) MEM_freeN(node->storage); } -static void copy_output_file(bNodeTree *UNUSED(dest_ntree), - bNode *dest_node, - const bNode *src_node) +static void copy_output_file(bNodeTree * /*dst_ntree*/, bNode *dest_node, const bNode *src_node) { bNodeSocket *src_sock, *dest_sock; @@ -282,7 +280,7 @@ static void update_output_file(bNodeTree *ntree, bNode *node) } } -static void node_composit_buts_file_output(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_file_output(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { PointerRNA imfptr = RNA_pointer_get(ptr, "format"); const bool multilayer = RNA_enum_get(&imfptr, "file_format") == R_IMF_IMTYPE_MULTILAYER; diff --git a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc index c814ea5f738..85e37e12231 100644 --- a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc +++ b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc @@ -26,7 +26,7 @@ static void cmp_node_premulkey_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_buts_premulkey(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_premulkey(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mapping", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_rotate.cc b/source/blender/nodes/composite/nodes/node_composite_rotate.cc index 35caa3cd242..5f3df3abd35 100644 --- a/source/blender/nodes/composite/nodes/node_composite_rotate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_rotate.cc @@ -33,12 +33,12 @@ static void cmp_node_rotate_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_rotate(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_rotate(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = 1; /* Bilinear Filter. */ } -static void node_composit_buts_rotate(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_rotate(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "filter_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_scale.cc b/source/blender/nodes/composite/nodes/node_composite_scale.cc index eb2d7162c69..b9f1f2da6a8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_scale.cc +++ b/source/blender/nodes/composite/nodes/node_composite_scale.cc @@ -54,7 +54,7 @@ static void node_composite_update_scale(bNodeTree *ntree, bNode *node) } } -static void node_composit_buts_scale(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_scale(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "space", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc index f6792d7ce61..d3f8530ae8b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_color.cc @@ -8,7 +8,7 @@ #include "node_composite_util.hh" -static void node_cmp_combsep_color_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_cmp_combsep_color_init(bNodeTree * /*ntree*/, bNode *node) { NodeCMPCombSepColor *data = MEM_cnew(__func__); data->mode = CMP_NODE_COMBSEP_COLOR_RGB; @@ -75,7 +75,7 @@ static void cmp_node_separate_color_declare(NodeDeclarationBuilder &b) b.add_output(N_("Alpha")); } -static void cmp_node_separate_color_update(bNodeTree *UNUSED(ntree), bNode *node) +static void cmp_node_separate_color_update(bNodeTree * /*ntree*/, bNode *node) { const NodeCMPCombSepColor *storage = (NodeCMPCombSepColor *)node->storage; node_cmp_combsep_color_label(&node->outputs, (CMPNodeCombSepColorMode)storage->mode); @@ -181,7 +181,7 @@ static void cmp_node_combine_color_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void cmp_node_combine_color_update(bNodeTree *UNUSED(ntree), bNode *node) +static void cmp_node_combine_color_update(bNodeTree * /*ntree*/, bNode *node) { const NodeCMPCombSepColor *storage = (NodeCMPCombSepColor *)node->storage; node_cmp_combsep_color_label(&node->inputs, (CMPNodeCombSepColorMode)storage->mode); diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc b/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc index bebe6abe115..78be1efbd8e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sepcomb_ycca.cc @@ -28,7 +28,7 @@ static void cmp_node_sepycca_declare(NodeDeclarationBuilder &b) b.add_output(N_("A")); } -static void node_composit_init_mode_sepycca(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_mode_sepycca(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = 1; /* BLI_YCC_ITU_BT709 */ } @@ -115,7 +115,7 @@ static void cmp_node_combycca_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_mode_combycca(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_mode_combycca(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = 1; /* BLI_YCC_ITU_BT709 */ } diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc index df3aca2c665..725ae6e3fcb 100644 --- a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc +++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc @@ -33,14 +33,14 @@ static void cmp_node_setalpha_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_setalpha(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_setalpha(bNodeTree * /*ntree*/, bNode *node) { NodeSetAlpha *settings = MEM_cnew(__func__); node->storage = settings; settings->mode = CMP_NODE_SETALPHA_MODE_APPLY; } -static void node_composit_buts_set_alpha(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_set_alpha(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc index 085de69e63e..f25d33033a2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc +++ b/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc @@ -29,7 +29,7 @@ static void cmp_node_split_viewer_declare(NodeDeclarationBuilder &b) b.add_input(N_("Image"), "Image_001"); } -static void node_composit_init_splitviewer(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_splitviewer(bNodeTree * /*ntree*/, bNode *node) { ImageUser *iuser = MEM_cnew(__func__); node->storage = iuser; @@ -39,7 +39,7 @@ static void node_composit_init_splitviewer(bNodeTree *UNUSED(ntree), bNode *node node->id = (ID *)BKE_image_ensure_viewer(G.main, IMA_TYPE_COMPOSITE, "Viewer Node"); } -static void node_composit_buts_splitviewer(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_splitviewer(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *row, *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc index 4b9264d7e35..d2ee9f567f2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc @@ -20,7 +20,7 @@ static void cmp_node_sunbeams_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void init(bNodeTree *UNUSED(ntree), bNode *node) +static void init(bNodeTree * /*ntree*/, bNode *node) { NodeSunBeams *data = MEM_cnew(__func__); @@ -29,7 +29,7 @@ static void init(bNodeTree *UNUSED(ntree), bNode *node) node->storage = data; } -static void node_composit_buts_sunbeams(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_sunbeams(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "source", UI_ITEM_R_SPLIT_EMPTY_NAME | UI_ITEM_R_EXPAND, "", ICON_NONE); uiItemR(layout, diff --git a/source/blender/nodes/composite/nodes/node_composite_switch.cc b/source/blender/nodes/composite/nodes/node_composite_switch.cc index 767802cc442..c62ae652029 100644 --- a/source/blender/nodes/composite/nodes/node_composite_switch.cc +++ b/source/blender/nodes/composite/nodes/node_composite_switch.cc @@ -23,7 +23,7 @@ static void cmp_node_switch_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_buts_switch(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_switch(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "check", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_switchview.cc b/source/blender/nodes/composite/nodes/node_composite_switchview.cc index e74c3b6007a..9b21ecab335 100644 --- a/source/blender/nodes/composite/nodes/node_composite_switchview.cc +++ b/source/blender/nodes/composite/nodes/node_composite_switchview.cc @@ -129,8 +129,8 @@ static void init_switch_view(const bContext *C, PointerRNA *ptr) } static void node_composit_buts_switch_view_ex(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *UNUSED(ptr)) + bContext * /*C*/, + PointerRNA * /*ptr*/) { uiItemFullO(layout, "NODE_OT_switch_view_update", diff --git a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc index 4cc3d4f32a3..2e06ad99df1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc +++ b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc @@ -22,7 +22,7 @@ static void cmp_node_tonemap_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_tonemap(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_tonemap(bNodeTree * /*ntree*/, bNode *node) { NodeTonemap *ntm = MEM_cnew(__func__); ntm->type = 1; @@ -38,7 +38,7 @@ static void node_composit_init_tonemap(bNodeTree *UNUSED(ntree), bNode *node) node->storage = ntm; } -static void node_composit_buts_tonemap(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_tonemap(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_transform.cc b/source/blender/nodes/composite/nodes/node_composite_transform.cc index 7c5866d2d06..0eaa860b45f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_transform.cc +++ b/source/blender/nodes/composite/nodes/node_composite_transform.cc @@ -49,7 +49,7 @@ static void cmp_node_transform_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_buts_transform(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_transform(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "filter_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } diff --git a/source/blender/nodes/composite/nodes/node_composite_translate.cc b/source/blender/nodes/composite/nodes/node_composite_translate.cc index e0f87ff604a..c8f9f8ee666 100644 --- a/source/blender/nodes/composite/nodes/node_composite_translate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_translate.cc @@ -39,13 +39,13 @@ static void cmp_node_translate_declare(NodeDeclarationBuilder &b) b.add_output(N_("Image")); } -static void node_composit_init_translate(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_translate(bNodeTree * /*ntree*/, bNode *node) { NodeTranslateData *data = MEM_cnew(__func__); node->storage = data; } -static void node_composit_buts_translate(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_translate(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "use_relative", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); uiItemR(layout, ptr, "wrap_axis", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); diff --git a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc index 03a7bc61924..2870b07f207 100644 --- a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc @@ -35,7 +35,7 @@ static void cmp_node_valtorgb_declare(NodeDeclarationBuilder &b) b.add_output(N_("Alpha")); } -static void node_composit_init_valtorgb(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_valtorgb(bNodeTree * /*ntree*/, bNode *node) { node->storage = BKE_colorband_add(true); } diff --git a/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc b/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc index 515478da75d..6d43647020f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc @@ -29,7 +29,7 @@ static void cmp_node_vec_blur_declare(NodeDeclarationBuilder &b) } /* custom1: iterations, custom2: max_speed (0 = no_limit). */ -static void node_composit_init_vecblur(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_vecblur(bNodeTree * /*ntree*/, bNode *node) { NodeBlurData *nbd = MEM_cnew(__func__); node->storage = nbd; @@ -37,7 +37,7 @@ static void node_composit_init_vecblur(bNodeTree *UNUSED(ntree), bNode *node) nbd->fac = 1.0f; } -static void node_composit_buts_vecblur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_vecblur(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_viewer.cc index 4e82b31ca47..c83674fa9c1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_viewer.cc +++ b/source/blender/nodes/composite/nodes/node_composite_viewer.cc @@ -35,7 +35,7 @@ static void cmp_node_viewer_declare(NodeDeclarationBuilder &b) b.add_input(N_("Z")).default_value(1.0f).min(0.0f).max(1.0f); } -static void node_composit_init_viewer(bNodeTree *UNUSED(ntree), bNode *node) +static void node_composit_init_viewer(bNodeTree * /*ntree*/, bNode *node) { ImageUser *iuser = MEM_cnew(__func__); node->storage = iuser; @@ -46,12 +46,12 @@ static void node_composit_init_viewer(bNodeTree *UNUSED(ntree), bNode *node) node->id = (ID *)BKE_image_ensure_viewer(G.main, IMA_TYPE_COMPOSITE, "Viewer Node"); } -static void node_composit_buts_viewer(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_viewer(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "use_alpha", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); } -static void node_composit_buts_viewer_ex(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_viewer_ex(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc index e5f460099e9..c1d9442e9ad 100644 --- a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc +++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc @@ -26,7 +26,7 @@ static void cmp_node_zcombine_declare(NodeDeclarationBuilder &b) b.add_output(N_("Z")); } -static void node_composit_buts_zcombine(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_composit_buts_zcombine(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; diff --git a/source/blender/nodes/function/node_function_util.cc b/source/blender/nodes/function/node_function_util.cc index d956f91a91d..82459815b77 100644 --- a/source/blender/nodes/function/node_function_util.cc +++ b/source/blender/nodes/function/node_function_util.cc @@ -5,7 +5,7 @@ #include "NOD_socket_search_link.hh" -static bool fn_node_poll_default(bNodeType *UNUSED(ntype), +static bool fn_node_poll_default(bNodeType * /*ntype*/, bNodeTree *ntree, const char **r_disabled_hint) { 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 &input_rotations = params.readonly_single_input(0, "Rotation"); const VArray &factors = params.readonly_single_input(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..7fc7829186a 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(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) 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..fddf606dfc9 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(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(__func__); data->mode = NODE_COMBSEP_COLOR_RGB; diff --git a/source/blender/nodes/function/nodes/node_fn_compare.cc b/source/blender/nodes/function/nodes/node_fn_compare.cc index 122d1a3c93e..4dd8d0c6ba4 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(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(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(__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) 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 452768208c5..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(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) 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..c68de06a91b 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(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>(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(__func__); node->storage = data; 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..9a66066189a 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(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>(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(__func__); copy_v4_fl4(data->color, 0.5f, 0.5f, 0.5f, 1.0f); 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..5285c242d88 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(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>(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(__func__); node->storage = data; 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 lb = params.uninitialized_single_output(0, "Line Break"); MutableSpan tab = params.uninitialized_single_output(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..a7172d9fcf9 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(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>(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); 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..49c8a6284e0 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(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>(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(__func__); node->storage = data; 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 341a3fbfa75..9f842e81071 100644 --- a/source/blender/nodes/function/nodes/node_fn_random_value.cc +++ b/source/blender/nodes/function/nodes/node_fn_random_value.cc @@ -42,12 +42,12 @@ static void fn_node_random_value_declare(NodeDeclarationBuilder &b) b.add_output(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(__func__); data->data_type = CD_PROP_FLOAT; 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..813d0a265f7 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); 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..19753f93b5c 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(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(__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 &colors = params.readonly_single_input(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 &colors = params.readonly_single_input(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 &colors = params.readonly_single_input(0, "Color"); diff --git a/source/blender/nodes/geometry/node_geometry_tree.cc b/source/blender/nodes/geometry/node_geometry_tree.cc index 61a416765a3..1339024b776 100644 --- a/source/blender/nodes/geometry/node_geometry_tree.cc +++ b/source/blender/nodes/geometry/node_geometry_tree.cc @@ -26,11 +26,8 @@ bNodeTreeType *ntreeType_Geometry; -static void geometry_node_tree_get_from_context(const bContext *C, - bNodeTreeType *UNUSED(treetype), - bNodeTree **r_ntree, - ID **r_id, - ID **r_from) +static void geometry_node_tree_get_from_context( + const bContext *C, bNodeTreeType * /*treetype*/, bNodeTree **r_ntree, ID **r_id, ID **r_from) { const Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -65,7 +62,7 @@ static void geometry_node_tree_update(bNodeTree *ntree) ntree_update_reroute_nodes(ntree); } -static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCallback func) +static void foreach_nodeclass(Scene * /*scene*/, void *calldata, bNodeClassCallback func) { func(calldata, NODE_CLASS_INPUT, N_("Input")); func(calldata, NODE_CLASS_GEOMETRY, N_("Geometry")); @@ -88,7 +85,7 @@ static bool geometry_node_tree_validate_link(eNodeSocketDatatype type_a, return type_a == type_b; } -static bool geometry_node_tree_socket_type_valid(bNodeTreeType *UNUSED(ntreetype), +static bool geometry_node_tree_socket_type_valid(bNodeTreeType * /*treetype*/, bNodeSocketType *socket_type) { return nodeIsStaticSocketType(socket_type) && ELEM(socket_type->type, diff --git a/source/blender/nodes/geometry/node_geometry_util.cc b/source/blender/nodes/geometry/node_geometry_util.cc index 3192459b8b5..8b962d39b3c 100644 --- a/source/blender/nodes/geometry/node_geometry_util.cc +++ b/source/blender/nodes/geometry/node_geometry_util.cc @@ -41,9 +41,7 @@ std::optional node_socket_to_custom_data_type(const bNodeSocket } // namespace blender::nodes -bool geo_node_poll_default(bNodeType *UNUSED(ntype), - bNodeTree *ntree, - const char **r_disabled_hint) +bool geo_node_poll_default(bNodeType * /*ntype*/, bNodeTree *ntree, const char **r_disabled_hint) { if (!STREQ(ntree->idname, "GeometryNodeTree")) { *r_disabled_hint = TIP_("Not a geometry node tree"); diff --git a/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc b/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc index 4504839dc5a..9af445090e9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc @@ -70,13 +70,13 @@ static void node_declare(NodeDeclarationBuilder &b) .description(N_(total_out_description)); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeAccumulateField *data = MEM_cnew(__func__); data->data_type = CD_PROP_FLOAT; diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc index 99dd4d9f798..1aea129bd53 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc @@ -30,7 +30,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Attribute"), "Attribute_004").field_source(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); @@ -38,7 +38,7 @@ static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryAttributeCapture *data = MEM_cnew(__func__); data->data_type = CD_PROP_FLOAT; diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc index a59236235a5..af55ef3f7ed 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc @@ -30,12 +30,12 @@ static void node_declare(NodeDeclarationBuilder &b) }); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "component", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { node->custom1 = GEO_COMPONENT_TYPE_MESH; } diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc index 0ab0081b9cf..3023c7bd751 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc @@ -40,13 +40,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Variance"), "Variance_001"); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { node->custom1 = CD_PROP_FLOAT; node->custom2 = ATTR_DOMAIN_POINT; diff --git a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc index 341f58f176b..094aab65653 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc @@ -24,7 +24,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Intersecting Edges")).field_source(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "operation", 0, "", ICON_NONE); } @@ -55,7 +55,7 @@ static void node_update(bNodeTree *ntree, bNode *node) } } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { node->custom1 = GEO_NODE_BOOLEAN_DIFFERENCE; } diff --git a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc index f4e8788cb8d..c4bee09e07b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc @@ -30,12 +30,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Geometry")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "transform_space", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } -static void node_node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCollectionInfo *data = MEM_cnew(__func__); data->transform_space = GEO_NODE_TRANSFORM_SPACE_ORIGINAL; diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc index d3d0dcfb794..4161ec7e7ad 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc @@ -42,7 +42,7 @@ class EndpointFieldInput final : public bke::CurvesFieldInput { GVArray get_varray_for_context(const bke::CurvesGeometry &curves, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { if (domain != ATTR_DOMAIN_POINT) { return {}; diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc index eb8c1e02fb7..6eaa40bff03 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc @@ -27,12 +27,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Mesh")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurveFill *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc index 50863b2031a..2b24b6cbf42 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc @@ -32,12 +32,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Curve")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurveFillet *data = MEM_cnew(__func__); data->mode = GEO_NODE_CURVE_FILLET_BEZIER; diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc index b4181528696..252f66c308f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc @@ -16,13 +16,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Selection")).field_source(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); uiItemR(layout, ptr, "handle_type", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurveSelectHandles *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc index 85a8ccc3192..74bfc3966a3 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc @@ -88,12 +88,12 @@ static void node_declare(NodeDeclarationBuilder &b) .make_available(enable_points); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree */*tree*/, bNode *node) { NodeGeometryCurvePrimitiveArc *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc index 875664c41fa..b407ac47dc9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc @@ -41,12 +41,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Curve")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurvePrimitiveBezierSegment *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc index 12df6f76a28..35fdd6754cc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc @@ -56,12 +56,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Center")).make_available(endable_points); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurvePrimitiveCircle *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc index 9f098674fe5..3741301c922 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc @@ -39,12 +39,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Curve")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree */*tree*/, bNode *node) { NodeGeometryCurvePrimitiveLine *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc index 9536917077e..44c2a078cb6 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc @@ -68,12 +68,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Curve")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurvePrimitiveQuad *data = MEM_cnew(__func__); data->mode = GEO_NODE_CURVE_PRIMITIVE_QUAD_MODE_RECTANGLE; diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc index db71371d464..8b6a7064362 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc @@ -26,12 +26,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Curve")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurveResample *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc index 186c00ddda0..27e111822bf 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc @@ -35,12 +35,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Normal")).dependent_field(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } -static void node_type_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_type_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurveSample *data = MEM_cnew(__func__); data->mode = GEO_NODE_CURVE_SAMPLE_LENGTH; @@ -134,7 +134,7 @@ class SampleFloatSegmentsFunction : 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 VArraySpan lengths = params.readonly_single_input(0, "Length"); MutableSpan indices = params.uninitialized_single_output(1, "Curve Index"); @@ -172,7 +172,7 @@ class SampleCurveFunction : 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 sampled_positions = params.uninitialized_single_output_if_required( 2, "Position"); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc index 8bb24821064..d37af6e5fe8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc @@ -20,13 +20,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Curve")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); uiItemR(layout, ptr, "handle_type", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurveSetHandles *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc index 00d3129a63d..3dc89a9058e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc @@ -106,7 +106,7 @@ static Array curve_length_point_domain(const bke::CurvesGeometry &curves) } static VArray construct_curve_parameter_varray(const bke::CurvesGeometry &curves, - const IndexMask UNUSED(mask), + const IndexMask /*mask*/, const eAttrDomain domain) { VArray cyclic = curves.cyclic(); @@ -169,7 +169,7 @@ static VArray construct_curve_parameter_varray(const bke::CurvesGeometry } static VArray construct_curve_length_parameter_varray(const bke::CurvesGeometry &curves, - const IndexMask UNUSED(mask), + const IndexMask /*mask*/, const eAttrDomain domain) { curves.ensure_evaluated_lengths(); @@ -188,7 +188,7 @@ static VArray construct_curve_length_parameter_varray(const bke::CurvesGe } static VArray construct_index_on_spline_varray(const bke::CurvesGeometry &curves, - const IndexMask UNUSED(mask), + const IndexMask /*mask*/, const eAttrDomain domain) { if (domain == ATTR_DOMAIN_POINT) { diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc index 4d7e5f13969..9ac6516ee7b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc @@ -20,12 +20,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Curve")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "spline_type", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurveSplineType *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc index e05d80bd722..e9eaa00b02d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc @@ -40,12 +40,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Rotation")).field_source(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurveToPoints *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc index a5a82557a4f..15c89d78276 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc @@ -46,12 +46,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Curve")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryCurveTrim *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc index 07226772447..86c8cd64489 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc @@ -1159,7 +1159,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Geometry")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { const bNode *node = static_cast(ptr->data); const NodeGeometryDeleteGeometry &storage = node_storage(*node); @@ -1172,7 +1172,7 @@ static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) } } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryDeleteGeometry *data = MEM_cnew(__func__); data->domain = ATTR_DOMAIN_POINT; diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc index 9910ccb84fa..091337c28cf 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc @@ -48,13 +48,13 @@ static void geo_node_distribute_points_in_volume_declare(NodeDeclarationBuilder } static void geo_node_distribute_points_in_volume_layout(uiLayout *layout, - bContext *UNUSED(C), + bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", 0, "", ICON_NONE); } -static void node_distribute_points_in_volume_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_distribute_points_in_volume_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryDistributePointsInVolume *data = MEM_cnew( __func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc index b3575332745..c2cc70296ed 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc @@ -62,7 +62,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Rotation")).subtype(PROP_EULER).field_source(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "distribute_method", 0, "", ICON_NONE); } @@ -185,7 +185,7 @@ BLI_NOINLINE static void update_elimination_mask_for_close_points( kdtree, positions[i], minimum_distance, - [](void *user_data, int index, const float *UNUSED(co), float UNUSED(dist_sq)) { + [](void *user_data, int index, const float * /*co*/, float /*dist_sq*/) { CallbackData &callback_data = *static_cast(user_data); if (index != callback_data.index) { callback_data.elimination_mask[index] = true; diff --git a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc index d2a3c339301..82d7e1d3652 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc @@ -40,14 +40,14 @@ static void node_declare(NodeDeclarationBuilder &b) .description(N_("The indices of the duplicates for each element")); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryDuplicateElements *data = MEM_cnew(__func__); data->domain = ATTR_DOMAIN_POINT; node->storage = data; } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc index d03bbbb32e1..1d8c9d6312c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc @@ -35,14 +35,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Side")).field_source(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "mode", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryExtrudeMesh *data = MEM_cnew(__func__); data->mode = GEO_NODE_EXTRUDE_MESH_FACES; diff --git a/source/blender/nodes/geometry/nodes/node_geo_field_at_index.cc b/source/blender/nodes/geometry/nodes/node_geo_field_at_index.cc index af6f15da60c..fc1e2cb2503 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_field_at_index.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_field_at_index.cc @@ -87,13 +87,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Value"), "Value_Bool").field_source(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { node->custom1 = ATTR_DOMAIN_POINT; node->custom2 = CD_PROP_FLOAT; diff --git a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc index 1dd48f437bd..7b2a85de3cb 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc @@ -31,13 +31,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Alpha")).no_muted_links().dependent_field(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "interpolation", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); uiItemR(layout, ptr, "extension", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryImageTexture *tex = MEM_cnew(__func__); node->storage = tex; @@ -285,7 +285,7 @@ class ImageFieldsFunction : public fn::MultiFunction { } } - 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 &vectors = params.readonly_single_input(0, "Vector"); MutableSpan r_color = params.uninitialized_single_output( diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc b/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc index 8c5a92904ab..a6e02a82c99 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc @@ -16,7 +16,7 @@ class InstanceRotationFieldInput final : public bke::InstancesFieldInput { } GVArray get_varray_for_context(const InstancesComponent &instances, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { auto rotation_fn = [&](const int i) -> float3 { return instances.instance_transforms()[i].to_euler(); diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc b/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc index b79e73915b7..dbb98d7e393 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc @@ -16,7 +16,7 @@ class InstanceScaleFieldInput final : public bke::InstancesFieldInput { } GVArray get_varray_for_context(const InstancesComponent &instances, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { auto scale_fn = [&](const int i) -> float3 { return instances.instance_transforms()[i].scale(); diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_material.cc b/source/blender/nodes/geometry/nodes/node_geo_input_material.cc index 6f3c6d23bd2..943193a0d82 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_material.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_material.cc @@ -12,7 +12,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Material")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "material", 0, "", ICON_NONE); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc index 0b9084d3715..29730ab8dc4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc @@ -62,7 +62,7 @@ class AngleFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { const Span verts = mesh.verts(); const Span polys = mesh.polys(); @@ -111,7 +111,7 @@ class SignedAngleFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { const Span verts = mesh.verts(); const Span edges = mesh.edges(); diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc index a579202738d..97c950988e7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_neighbors.cc @@ -26,7 +26,7 @@ class EdgeNeighborCountFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { const Span loops = mesh.loops(); Array face_count(mesh.totedge, 0); diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc index 31c82133e2f..8d5b1432d53 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc @@ -53,7 +53,7 @@ class EdgeVertsInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { if (domain != ATTR_DOMAIN_EDGE) { return {}; diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc index a8670209014..aec1c27a4fc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc @@ -40,7 +40,7 @@ class FaceAreaFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { return construct_face_area_varray(mesh, domain); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc index 429526588ce..f1724ef4a41 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_neighbors.cc @@ -51,7 +51,7 @@ class FaceNeighborCountFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { return construct_neighbor_count_varray(mesh, domain); } @@ -92,7 +92,7 @@ class FaceVertexCountFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { return construct_vertex_count_varray(mesh, domain); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc index 6d19d3be511..6b54828b042 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc @@ -31,7 +31,7 @@ class IslandFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { const Span edges = mesh.edges(); @@ -77,7 +77,7 @@ class IslandCountFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { const Span edges = mesh.edges(); diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_vertex_neighbors.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_vertex_neighbors.cc index 6b7f62a944c..5b1b32c7b9c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_vertex_neighbors.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_vertex_neighbors.cc @@ -43,7 +43,7 @@ class VertexCountFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { return construct_vertex_count_gvarray(mesh, domain); } @@ -88,7 +88,7 @@ class VertexFaceCountFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { return construct_face_count_gvarray(mesh, domain); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc index 8973c1db319..1063a022e9d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc @@ -22,12 +22,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Attribute"), "Attribute_Int").field_source(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryInputNamedAttribute *data = MEM_cnew(__func__); data->data_type = CD_PROP_FLOAT; diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc b/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc index 07dc158ff48..4bb4618588b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_spline_length.cc @@ -41,7 +41,7 @@ class SplineCountFieldInput final : public bke::CurvesFieldInput { GVArray get_varray_for_context(const bke::CurvesGeometry &curves, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { return construct_curve_point_count_gvarray(curves, domain); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc b/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc index ea3d060f03c..7e7b0eb215f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc @@ -95,7 +95,7 @@ class TangentFieldInput final : public bke::CurvesFieldInput { GVArray get_varray_for_context(const bke::CurvesGeometry &curves, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { return construct_curve_tangent_gvarray(curves, domain); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc b/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc index 0326c55b65a..d4e18321665 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_interpolate_domain.cc @@ -28,13 +28,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Value"), "Value_Bool").field_source(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { node->custom1 = ATTR_DOMAIN_POINT; node->custom2 = CD_PROP_FLOAT; diff --git a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc index 9fdf7fe7d31..74d1b5561bb 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc @@ -125,12 +125,11 @@ static void join_components(Span src_components, Geo join_attributes(to_base_components(src_components), dst_component, {"position"}); } -static void join_components(Span src_components, GeometrySet &result) +static void join_components(Span /*src_components*/, + GeometrySet & /*result*/) { /* Not yet supported. Joining volume grids with the same name requires resampling of at least one * of the grids. The cell size of the resulting volume has to be determined somehow. */ - VolumeComponent &dst_component = result.get_component_for_write(); - UNUSED_VARS(src_components, dst_component); } template diff --git a/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc b/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc index f64f997810e..ce8b078f195 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc @@ -24,14 +24,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Geometry")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "mode", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryMergeByDistance *data = MEM_cnew(__func__); data->mode = GEO_NODE_MERGE_BY_DISTANCE_MODE_ALL; diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc index c69ea8635ca..31a3e967905 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc @@ -29,14 +29,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Mesh")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "fill_type", 0, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryMeshCircle *node_storage = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc index bd36b85180f..4a9264b8464 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc @@ -743,7 +743,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Side")).field_source(); } -static void node_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryMeshCone *node_storage = MEM_cnew(__func__); @@ -764,7 +764,7 @@ static void node_update(bNodeTree *ntree, bNode *node) nodeSetSocketAvailability(ntree, fill_subdiv_socket, has_fill); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc index 587999f3d00..f192b385b1b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc @@ -48,14 +48,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Bottom")).field_source(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "fill_type", 0, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryMeshCylinder *node_storage = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc index a755fd1a75d..7faa7e23274 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc @@ -43,7 +43,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Mesh")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); @@ -53,7 +53,7 @@ static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) } } -static void node_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryMeshLine *node_storage = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc index ceb87c59b8e..d97a0e72060 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc @@ -33,12 +33,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Points")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryMeshToPoints *data = MEM_cnew(__func__); data->mode = GEO_NODE_MESH_TO_POINTS_VERTICES; diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc index de04f0561e5..8885903f828 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc @@ -50,14 +50,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Volume")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "resolution_mode", 0, IFACE_("Resolution"), ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryMeshToVolume *data = MEM_cnew(__func__); data->resolution_mode = MESH_TO_VOLUME_RESOLUTION_MODE_VOXEL_AMOUNT; diff --git a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc index 691988249df..3ce16fac464 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc @@ -25,7 +25,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Geometry")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "transform_space", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } @@ -88,7 +88,7 @@ static void node_geo_exec(GeoNodeExecParams params) } } -static void node_node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryObjectInfo *data = MEM_cnew(__func__); data->transform_space = GEO_NODE_TRANSFORM_SPACE_ORIGINAL; diff --git a/source/blender/nodes/geometry/nodes/node_geo_points.cc b/source/blender/nodes/geometry/nodes/node_geo_points.cc index 4a294076834..29af45caf9e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_points.cc @@ -43,7 +43,7 @@ class PointsFieldContext : public FieldContext { GVArray get_varray_for_input(const FieldInput &field_input, const IndexMask mask, - ResourceScope &UNUSED(scope)) const + ResourceScope & /*scope*/) const { const bke::IDAttributeFieldInput *id_field_input = dynamic_cast(&field_input); diff --git a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc index ec9a40f8cf8..45f6820f2e5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc @@ -43,14 +43,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Volume")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "resolution_mode", 0, IFACE_("Resolution"), ICON_NONE); } -static void node_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryPointsToVolume *data = MEM_cnew(__func__); data->resolution_mode = GEO_NODE_POINTS_TO_VOLUME_RESOLUTION_MODE_AMOUNT; diff --git a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc index f453c7cb47a..21f4449baee 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc @@ -27,12 +27,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Distance")).dependent_field(); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "target_element", 0, "", ICON_NONE); } -static void geo_proximity_init(bNodeTree *UNUSED(ntree), bNode *node) +static void geo_proximity_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryProximity *node_storage = MEM_cnew(__func__); node_storage->target_element = GEO_NODE_PROX_TARGET_FACES; @@ -151,7 +151,7 @@ class ProximityFunction : 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 &src_positions = params.readonly_single_input(0, "Source Position"); diff --git a/source/blender/nodes/geometry/nodes/node_geo_raycast.cc b/source/blender/nodes/geometry/nodes/node_geo_raycast.cc index 118d6c2f6c7..d248bc539b1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_raycast.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_raycast.cc @@ -53,13 +53,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Attribute"), "Attribute_004").dependent_field({1, 2, 3, 4, 5, 6}); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); uiItemR(layout, ptr, "mapping", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryRaycast *data = MEM_cnew(__func__); data->mapping = GEO_NODE_RAYCAST_INTERPOLATED; @@ -245,7 +245,7 @@ class RaycastFunction : 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 { /* Hit positions are always necessary for retrieving the attribute from the target if that * output is required, so always retrieve a span from the evaluator in that case (it's diff --git a/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc index 1c72d73d151..3ccc8afb0a7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc @@ -15,7 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Geometry")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "legacy_behavior", 0, nullptr, ICON_NONE); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc index bfaf9b70f13..4d2db059798 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc @@ -39,14 +39,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Value"), "Value_Bool").dependent_field({6}); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); uiItemR(layout, ptr, "clamp", 0, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometrySampleIndex *data = MEM_cnew(__func__); data->data_type = CD_PROP_FLOAT; @@ -231,7 +231,7 @@ class SampleIndexFunction : public fn::MultiFunction { src_data_ = &evaluator_->get_evaluated(0); } - 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 &indices = params.readonly_single_input(0, "Index"); GMutableSpan dst = params.uninitialized_single_output(1, "Value"); diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc index 95f7c7add3a..f81fcd8bab7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc @@ -56,12 +56,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Index")).dependent_field({1}); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { node->custom1 = CD_PROP_FLOAT; node->custom2 = ATTR_DOMAIN_POINT; @@ -264,7 +264,7 @@ class SampleNearestFunction : 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 &positions = params.readonly_single_input(0, "Position"); MutableSpan indices = params.uninitialized_single_output(1, "Index"); diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc index f3c182cd97a..8acfb7bc1b4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc @@ -44,12 +44,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Value"), "Value_Bool").dependent_field({6}); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { node->custom1 = CD_PROP_FLOAT; } @@ -158,7 +158,7 @@ class SampleNearestSurfaceFunction : 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 &positions = params.readonly_single_input(0, "Position"); GMutableSpan dst = params.uninitialized_single_output_if_required(1, "Value"); diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc index 9077214b44e..2e8446ba559 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc @@ -46,12 +46,12 @@ static void node_declare(NodeDeclarationBuilder &b) .description(N_("Whether the node could find a single face to sample at the UV coordinate")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { node->custom1 = CD_PROP_FLOAT; } @@ -147,7 +147,7 @@ class SampleUVSurfaceFunction : 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 &sample_uvs = params.readonly_single_input(0, "Sample UV"); GMutableSpan dst = params.uninitialized_single_output_if_required(1, "Value"); diff --git a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc index 0f3135c799a..5f1baa23511 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc @@ -36,13 +36,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Geometry")); }; -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); uiItemR(layout, ptr, "scale_mode", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { node->custom1 = ATTR_DOMAIN_FACE; node->custom2 = GEO_NODE_SCALE_ELEMENTS_UNIFORM; diff --git a/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc index f40ad62a5e4..44d12466d9e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc @@ -23,12 +23,12 @@ static void node_declare(NodeDeclarationBuilder &b) .description(N_("The parts of the geometry not in the selection")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometrySeparateGeometry *data = MEM_cnew(__func__); data->domain = ATTR_DOMAIN_POINT; diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc b/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc index 5610edf7e4c..c143203337a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc @@ -26,12 +26,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Curve")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometrySetCurveHandlePositions *data = MEM_cnew( __func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc b/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc index bac15622c2a..a61f853c6ed 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc @@ -16,12 +16,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Curve")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "mode", 0, nullptr, ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { node->custom1 = NORMAL_MODE_MINIMUM_TWIST; } diff --git a/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc index 51b21b218fe..3c85fd459e1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc @@ -30,7 +30,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Geometry")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); @@ -38,7 +38,7 @@ static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryStoreNamedAttribute *data = MEM_cnew(__func__); data->data_type = CD_PROP_FLOAT; diff --git a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc index e8913f80916..bbdabc09099 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc @@ -76,7 +76,7 @@ static void node_layout(uiLayout *layout, struct bContext *C, PointerRNA *ptr) uiItemR(layout, ptr, "pivot_mode", 0, IFACE_("Pivot Point"), ICON_NONE); } -static void node_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryStringToCurves *data = MEM_cnew(__func__); diff --git a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc index 60c8a89a6bf..2e6ad02bfd5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc @@ -39,13 +39,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Mesh")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "uv_smooth", 0, "", ICON_NONE); uiItemR(layout, ptr, "boundary_smooth", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometrySubdivisionSurface *data = MEM_cnew(__func__); data->uv_smooth = SUBSURF_UV_SMOOTH_PRESERVE_BOUNDARIES; diff --git a/source/blender/nodes/geometry/nodes/node_geo_switch.cc b/source/blender/nodes/geometry/nodes/node_geo_switch.cc index 6dc30af4fb6..36be68f1a22 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_switch.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_switch.cc @@ -73,12 +73,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Output"), "Output_011"); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "input_type", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeSwitch *data = MEM_cnew(__func__); data->input_type = SOCK_GEOMETRY; diff --git a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc index 04fe7641899..cedc1ef845b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc @@ -23,13 +23,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Mesh")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "quad_method", 0, "", ICON_NONE); uiItemR(layout, ptr, "ngon_method", 0, "", ICON_NONE); } -static void geo_triangulate_init(bNodeTree *UNUSED(ntree), bNode *node) +static void geo_triangulate_init(bNodeTree * /*tree*/, bNode *node) { node->custom1 = GEO_NODE_TRIANGULATE_QUAD_SHORTEDGE; node->custom2 = GEO_NODE_TRIANGULATE_NGON_BEAUTY; diff --git a/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc b/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc index 67e35f1f023..c2d27cffa93 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc @@ -114,7 +114,7 @@ class PackIslandsFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { return construct_uv_gvarray(mesh, selection_field, uv_field, rotate, margin, domain); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc index ae9a532ed66..e45ce6b42b4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc @@ -40,14 +40,14 @@ static void node_declare(NodeDeclarationBuilder &b) N_("UV coordinates between 0 and 1 for each face corner in the selected faces")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "method", 0, "", ICON_NONE); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryUVUnwrap *data = MEM_cnew(__func__); data->method = GEO_NODE_UV_UNWRAP_METHOD_ANGLE_BASED; @@ -156,7 +156,7 @@ class UnwrapFieldInput final : public bke::MeshFieldInput { GVArray get_varray_for_context(const Mesh &mesh, const eAttrDomain domain, - IndexMask UNUSED(mask)) const final + const IndexMask /*mask*/) const final { return construct_uv_gvarray(mesh, selection, seam, fill_holes, margin, method, domain); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc index ec900a41bbc..e9050f9e6a1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc @@ -26,7 +26,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input(N_("Value"), "Value_004").supports_field().hide_value(); } -static void node_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryViewer *data = MEM_cnew(__func__); data->data_type = CD_PROP_FLOAT; @@ -35,12 +35,12 @@ static void node_init(bNodeTree *UNUSED(tree), bNode *node) node->storage = data; } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "domain", 0, "", ICON_NONE); } -static void node_layout_ex(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout_ex(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_cube.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_cube.cc index 4018f85fc94..7d439309380 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_volume_cube.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_volume_cube.cc @@ -79,8 +79,8 @@ class Grid3DFieldContext : public FieldContext { } GVArray get_varray_for_input(const FieldInput &field_input, - const IndexMask UNUSED(mask), - ResourceScope &UNUSED(scope)) const + const IndexMask /*mask*/, + ResourceScope & /*scope*/) const { const bke::AttributeFieldInput *attribute_field_input = dynamic_cast(&field_input); diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc index 763e207b388..88e7718ed3c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc @@ -48,14 +48,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Mesh")); } -static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayoutSetPropSep(layout, true); uiLayoutSetPropDecorate(layout, false); uiItemR(layout, ptr, "resolution_mode", 0, IFACE_("Resolution"), ICON_NONE); } -static void node_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_init(bNodeTree * /*tree*/, bNode *node) { NodeGeometryVolumeToMesh *data = MEM_cnew(__func__); data->resolution_mode = VOLUME_TO_MESH_RESOLUTION_MODE_GRID; diff --git a/source/blender/nodes/intern/geometry_nodes_lazy_function.cc b/source/blender/nodes/intern/geometry_nodes_lazy_function.cc index 553b33ee5ea..6475a16477a 100644 --- a/source/blender/nodes/intern/geometry_nodes_lazy_function.cc +++ b/source/blender/nodes/intern/geometry_nodes_lazy_function.cc @@ -168,7 +168,7 @@ class LazyFunctionForMultiInput : public LazyFunction { outputs_.append({"Output", *vector_type}); } - void execute_impl(lf::Params ¶ms, const lf::Context &UNUSED(context)) const override + void execute_impl(lf::Params ¶ms, const lf::Context & /*context*/) const override { /* Currently we only have multi-inputs for geometry and string sockets. This could be * generalized in the future. */ @@ -202,7 +202,7 @@ class LazyFunctionForRerouteNode : public LazyFunction { outputs_.append({"Output", type}); } - void execute_impl(lf::Params ¶ms, const lf::Context &UNUSED(context)) const override + void execute_impl(lf::Params ¶ms, const lf::Context & /*context*/) const override { void *input_value = params.try_get_input_data_ptr(0); void *output_value = params.get_output_data_ptr(0); @@ -230,7 +230,7 @@ class LazyFunctionForUndefinedNode : public LazyFunction { node, dummy_used_inputs, r_used_outputs, dummy_inputs, outputs_); } - void execute_impl(lf::Params ¶ms, const lf::Context &UNUSED(context)) const override + void execute_impl(lf::Params ¶ms, const lf::Context & /*context*/) const override { params.set_default_remaining_outputs(); } @@ -351,7 +351,7 @@ class LazyFunctionForMutedNode : public LazyFunction { } } - void execute_impl(lf::Params ¶ms, const lf::Context &UNUSED(context)) const override + void execute_impl(lf::Params ¶ms, const lf::Context & /*context*/) const override { for (const int output_i : outputs_.index_range()) { if (params.output_was_set(output_i)) { @@ -423,7 +423,7 @@ class LazyFunctionForMultiFunctionConversion : public LazyFunction { outputs_.append({"To", to}); } - void execute_impl(lf::Params ¶ms, const lf::Context &UNUSED(context)) const override + void execute_impl(lf::Params ¶ms, const lf::Context & /*context*/) const override { const void *from_value = params.try_get_input_data_ptr(0); void *to_value = params.get_output_data_ptr(0); @@ -464,7 +464,7 @@ class LazyFunctionForMultiFunctionNode : public LazyFunction { } } - void execute_impl(lf::Params ¶ms, const lf::Context &UNUSED(context)) const override + void execute_impl(lf::Params ¶ms, const lf::Context & /*context*/) const override { Vector input_values(inputs_.size()); Vector output_values(outputs_.size()); @@ -501,7 +501,7 @@ class LazyFunctionForImplicitInput : public LazyFunction { outputs_.append({"Output", type}); } - void execute_impl(lf::Params ¶ms, const lf::Context &UNUSED(context)) const override + void execute_impl(lf::Params ¶ms, const lf::Context & /*context*/) const override { void *value = params.get_output_data_ptr(0); init_fn_(value); @@ -1448,7 +1448,7 @@ GeometryNodesLazyFunctionGraphInfo::~GeometryNodesLazyFunctionGraphInfo() } void GeometryNodesLazyFunctionLogger::log_before_node_execute(const lf::FunctionNode &node, - const lf::Params &UNUSED(params), + const lf::Params & /*params*/, const lf::Context &context) const { /* Enable this to see the threads that invoked a node. */ diff --git a/source/blender/nodes/intern/geometry_nodes_log.cc b/source/blender/nodes/intern/geometry_nodes_log.cc index 909f7779e95..167bfef0f83 100644 --- a/source/blender/nodes/intern/geometry_nodes_log.cc +++ b/source/blender/nodes/intern/geometry_nodes_log.cc @@ -69,7 +69,7 @@ GeometryInfoLog::GeometryInfoLog(const GeometrySet &geometry_set) true, [&](const bke::AttributeIDRef &attribute_id, const bke::AttributeMetaData &meta_data, - const GeometryComponent &UNUSED(component)) { + const GeometryComponent & /*component*/) { if (attribute_id.is_named() && names.add(attribute_id.name())) { this->attributes.append({attribute_id.name(), meta_data.domain, meta_data.data_type}); } diff --git a/source/blender/nodes/intern/node_common.cc b/source/blender/nodes/intern/node_common.cc index 022ea3313e2..d7cc0b6065a 100644 --- a/source/blender/nodes/intern/node_common.cc +++ b/source/blender/nodes/intern/node_common.cc @@ -63,7 +63,7 @@ bNodeSocket *node_group_find_output_socket(bNode *groupnode, const char *identif return find_matching_socket(groupnode->outputs, identifier); } -void node_group_label(const bNodeTree *UNUSED(ntree), const bNode *node, char *label, int maxlen) +void node_group_label(const bNodeTree * /*ntree*/, const bNode *node, char *label, int maxlen) { BLI_strncpy(label, (node->id) ? node->id->name + 2 : IFACE_("Missing Data-Block"), maxlen); } @@ -238,7 +238,7 @@ void node_group_update(struct bNodeTree *ntree, struct bNode *node) /** \name Node Frame * \{ */ -static void node_frame_init(bNodeTree *UNUSED(ntree), bNode *node) +static void node_frame_init(bNodeTree * /*ntree*/, bNode *node) { NodeFrame *data = MEM_cnew("frame node storage"); node->storage = data; diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc index 79ce9b76e82..f2f4519625a 100644 --- a/source/blender/nodes/intern/node_socket.cc +++ b/source/blender/nodes/intern/node_socket.cc @@ -531,11 +531,11 @@ void node_socket_skip_reroutes( } } -static void standard_node_socket_interface_init_socket(bNodeTree *UNUSED(ntree), +static void standard_node_socket_interface_init_socket(bNodeTree * /*ntree*/, const bNodeSocket *interface_socket, - bNode *UNUSED(node), + bNode * /*node*/, bNodeSocket *sock, - const char *UNUSED(data_path)) + const char * /*data_path*/) { /* initialize the type value */ sock->type = sock->typeinfo->type; @@ -549,11 +549,11 @@ static void standard_node_socket_interface_init_socket(bNodeTree *UNUSED(ntree), } /* copies settings that are not changed for each socket instance */ -static void standard_node_socket_interface_verify_socket(bNodeTree *UNUSED(ntree), +static void standard_node_socket_interface_verify_socket(bNodeTree * /*ntree*/, const bNodeSocket *interface_socket, - bNode *UNUSED(node), + bNode * /*node*/, bNodeSocket *sock, - const char *UNUSED(data_path)) + const char * /*data_path*/) { /* sanity check */ if (sock->type != interface_socket->typeinfo->type) { @@ -594,9 +594,9 @@ static void standard_node_socket_interface_verify_socket(bNodeTree *UNUSED(ntree } } -static void standard_node_socket_interface_from_socket(bNodeTree *UNUSED(ntree), +static void standard_node_socket_interface_from_socket(bNodeTree * /*ntree*/, bNodeSocket *stemp, - bNode *UNUSED(node), + bNode * /*node*/, bNodeSocket *sock) { /* initialize settings */ @@ -801,7 +801,7 @@ static bNodeSocketType *make_socket_type_geometry() { bNodeSocketType *socktype = make_standard_socket_type(SOCK_GEOMETRY, PROP_NONE); socktype->base_cpp_type = &blender::CPPType::get(); - socktype->get_base_cpp_value = [](const bNodeSocket &UNUSED(socket), void *r_value) { + socktype->get_base_cpp_value = [](const bNodeSocket & /*socket*/, void *r_value) { new (r_value) GeometrySet(); }; socktype->geometry_nodes_cpp_type = socktype->base_cpp_type; diff --git a/source/blender/nodes/intern/node_socket_declarations.cc b/source/blender/nodes/intern/node_socket_declarations.cc index b9fb75f30c7..a7d281bcf52 100644 --- a/source/blender/nodes/intern/node_socket_declarations.cc +++ b/source/blender/nodes/intern/node_socket_declarations.cc @@ -50,7 +50,7 @@ static bool sockets_can_connect(const SocketDeclaration &socket_decl, return true; } -static bool basic_types_can_connect(const SocketDeclaration &UNUSED(socket_decl), +static bool basic_types_can_connect(const SocketDeclaration & /*socket_decl*/, const bNodeSocket &other_socket) { return ELEM(other_socket.type, SOCK_FLOAT, SOCK_INT, SOCK_BOOLEAN, SOCK_VECTOR, SOCK_RGBA); diff --git a/source/blender/nodes/shader/node_shader_tree.cc b/source/blender/nodes/shader/node_shader_tree.cc index 2edcd160345..52edf68b3ff 100644 --- a/source/blender/nodes/shader/node_shader_tree.cc +++ b/source/blender/nodes/shader/node_shader_tree.cc @@ -52,7 +52,7 @@ using blender::Array; using blender::Vector; -static bool shader_tree_poll(const bContext *C, bNodeTreeType *UNUSED(treetype)) +static bool shader_tree_poll(const bContext *C, bNodeTreeType * /*treetype*/) { Scene *scene = CTX_data_scene(C); const char *engine_id = scene->r.engine; @@ -63,11 +63,8 @@ static bool shader_tree_poll(const bContext *C, bNodeTreeType *UNUSED(treetype)) !BKE_scene_use_shading_nodes_custom(scene)); } -static void shader_get_from_context(const bContext *C, - bNodeTreeType *UNUSED(treetype), - bNodeTree **r_ntree, - ID **r_id, - ID **r_from) +static void shader_get_from_context( + const bContext *C, bNodeTreeType * /*treetype*/, bNodeTree **r_ntree, ID **r_id, ID **r_from) { SpaceNode *snode = CTX_wm_space_node(C); Scene *scene = CTX_data_scene(C); @@ -110,7 +107,7 @@ static void shader_get_from_context(const bContext *C, } } -static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCallback func) +static void foreach_nodeclass(Scene * /*scene*/, void *calldata, bNodeClassCallback func) { func(calldata, NODE_CLASS_INPUT, N_("Input")); func(calldata, NODE_CLASS_OUTPUT, N_("Output")); @@ -125,7 +122,7 @@ static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCa func(calldata, NODE_CLASS_LAYOUT, N_("Layout")); } -static void localize(bNodeTree *localtree, bNodeTree *UNUSED(ntree)) +static void localize(bNodeTree *localtree, bNodeTree * /*ntree*/) { /* replace muted nodes and reroute nodes by internal links */ LISTBASE_FOREACH_MUTABLE (bNode *, node, &localtree->nodes) { @@ -153,7 +150,7 @@ static bool shader_validate_link(eNodeSocketDatatype from, eNodeSocketDatatype t return true; } -static bool shader_node_tree_socket_type_valid(bNodeTreeType *UNUSED(ntreetype), +static bool shader_node_tree_socket_type_valid(bNodeTreeType * /*ntreetype*/, bNodeSocketType *socket_type) { return nodeIsStaticSocketType(socket_type) && @@ -642,7 +639,7 @@ static bool ntree_shader_implicit_closure_cast(bNodeTree *ntree) /* Socket already has a link to it. Add weights together. */ static void ntree_weight_tree_merge_weight(bNodeTree *ntree, - bNode *UNUSED(fromnode), + bNode * /*fromnode*/, bNodeSocket *fromsock, bNode **tonode, bNodeSocket **tosock) @@ -947,7 +944,7 @@ static bool closure_node_filter(const bNode *node) } } -static bool shader_to_rgba_node_gather(bNode *UNUSED(fromnode), bNode *tonode, void *userdata) +static bool shader_to_rgba_node_gather(bNode * /*fromnode*/, bNode *tonode, void *userdata) { Vector &shader_to_rgba_nodes = *(Vector *)userdata; if (tonode->tmp_flag == -1 && tonode->type == SH_NODE_SHADERTORGB) { @@ -987,7 +984,7 @@ static void ntree_shader_shader_to_rgba_branch(bNodeTree *ntree, bNode *output_n } } -static bool ntree_branch_node_tag(bNode *fromnode, bNode *tonode, void *UNUSED(userdata)) +static bool ntree_branch_node_tag(bNode *fromnode, bNode *tonode, void * /*userdata*/) { fromnode->tmp_flag = 1; tonode->tmp_flag = 1; diff --git a/source/blender/nodes/shader/node_shader_util.cc b/source/blender/nodes/shader/node_shader_util.cc index 059d7800fc5..929b11ded3e 100644 --- a/source/blender/nodes/shader/node_shader_util.cc +++ b/source/blender/nodes/shader/node_shader_util.cc @@ -13,7 +13,7 @@ #include "node_exec.h" -bool sh_node_poll_default(bNodeType *UNUSED(ntype), bNodeTree *ntree, const char **r_disabled_hint) +bool sh_node_poll_default(bNodeType * /*ntype*/, bNodeTree *ntree, const char **r_disabled_hint) { if (!STREQ(ntree->idname, "ShaderNodeTree")) { *r_disabled_hint = TIP_("Not a shader node tree"); @@ -22,7 +22,7 @@ bool sh_node_poll_default(bNodeType *UNUSED(ntype), bNodeTree *ntree, const char return true; } -static bool sh_fn_poll_default(bNodeType *UNUSED(ntype), +static bool sh_fn_poll_default(bNodeType * /*ntype*/, bNodeTree *ntree, const char **r_disabled_hint) { @@ -284,7 +284,7 @@ void ntreeExecGPUNodes(bNodeTreeExec *exec, GPUMaterial *mat, bNode *output_node } } -void node_shader_gpu_bump_tex_coord(GPUMaterial *mat, bNode *UNUSED(node), GPUNodeLink **link) +void node_shader_gpu_bump_tex_coord(GPUMaterial *mat, bNode * /*node*/, GPUNodeLink **link) { GPU_link(mat, "differentiate_texco", *link, link); } @@ -300,7 +300,7 @@ void node_shader_gpu_default_tex_coord(GPUMaterial *mat, bNode *node, GPUNodeLin void node_shader_gpu_tex_mapping(GPUMaterial *mat, bNode *node, GPUNodeStack *in, - GPUNodeStack *UNUSED(out)) + GPUNodeStack * /*out*/) { NodeTexBase *base = (NodeTexBase *)node->storage; TexMapping *texmap = &base->tex_mapping; diff --git a/source/blender/nodes/shader/nodes/node_shader_add_shader.cc b/source/blender/nodes/shader/nodes/node_shader_add_shader.cc index 330bdc0ba61..f7b25225e30 100644 --- a/source/blender/nodes/shader/nodes/node_shader_add_shader.cc +++ b/source/blender/nodes/shader/nodes/node_shader_add_shader.cc @@ -14,7 +14,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_add_shader(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc index 1e8df2e985d..5f30fe0dd30 100644 --- a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc +++ b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc @@ -17,9 +17,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("AO")); } -static void node_shader_buts_ambient_occlusion(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) +static void node_shader_buts_ambient_occlusion(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "samples", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); uiItemR(layout, ptr, "inside", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); @@ -28,7 +26,7 @@ static void node_shader_buts_ambient_occlusion(uiLayout *layout, static int node_shader_gpu_ambient_occlusion(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -50,7 +48,7 @@ static int node_shader_gpu_ambient_occlusion(GPUMaterial *mat, GPU_constant(&f_samples)); } -static void node_shader_init_ambient_occlusion(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_ambient_occlusion(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = 16; /* samples */ node->custom2 = 0; diff --git a/source/blender/nodes/shader/nodes/node_shader_attribute.cc b/source/blender/nodes/shader/nodes/node_shader_attribute.cc index 65d053e6379..77cf6b163d0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_attribute.cc +++ b/source/blender/nodes/shader/nodes/node_shader_attribute.cc @@ -16,13 +16,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Alpha")); } -static void node_shader_buts_attribute(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_attribute(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "attribute_type", UI_ITEM_R_SPLIT_EMPTY_NAME, IFACE_("Type"), ICON_NONE); uiItemR(layout, ptr, "attribute_name", UI_ITEM_R_SPLIT_EMPTY_NAME, IFACE_("Name"), ICON_NONE); } -static void node_shader_init_attribute(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_attribute(bNodeTree * /*ntree*/, bNode *node) { NodeShaderAttribute *attr = MEM_cnew("NodeShaderAttribute"); node->storage = attr; @@ -30,7 +30,7 @@ static void node_shader_init_attribute(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_attribute(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_background.cc b/source/blender/nodes/shader/nodes/node_shader_background.cc index ea5c1f541ea..1e41b66189a 100644 --- a/source/blender/nodes/shader/nodes/node_shader_background.cc +++ b/source/blender/nodes/shader/nodes/node_shader_background.cc @@ -15,7 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_background(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bevel.cc b/source/blender/nodes/shader/nodes/node_shader_bevel.cc index 4ae60af9974..14356a46125 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bevel.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bevel.cc @@ -15,19 +15,19 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Normal")); } -static void node_shader_buts_bevel(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_bevel(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "samples", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); } -static void node_shader_init_bevel(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_bevel(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = 4; /* samples */ } static int gpu_shader_bevel(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_blackbody.cc b/source/blender/nodes/shader/nodes/node_shader_blackbody.cc index 9f382e5a3bb..23e9a601045 100644 --- a/source/blender/nodes/shader/nodes/node_shader_blackbody.cc +++ b/source/blender/nodes/shader/nodes/node_shader_blackbody.cc @@ -15,7 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_blackbody(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_brightness.cc b/source/blender/nodes/shader/nodes/node_shader_brightness.cc index a23783c6d46..09f0e21208c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_brightness.cc +++ b/source/blender/nodes/shader/nodes/node_shader_brightness.cc @@ -15,7 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int gpu_shader_brightcontrast(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc index 761a833f377..2071b78fa64 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc @@ -28,19 +28,19 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("BSDF")); } -static void node_shader_buts_anisotropic(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_anisotropic(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "distribution", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } -static void node_shader_init_anisotropic(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_anisotropic(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = SHD_GLOSSY_GGX; } static int node_shader_gpu_bsdf_anisotropic(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc index 5975e04450e..a4f0e04576f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc @@ -20,7 +20,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_bsdf_diffuse(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc index 95869f13b7e..b3c047c3a47 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc @@ -19,14 +19,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("BSDF")); } -static void node_shader_init_glass(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_glass(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = SHD_GLOSSY_BECKMANN; } static int node_shader_gpu_bsdf_glass(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc index 07062a9730e..7beecc0ecd4 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc @@ -18,14 +18,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("BSDF")); } -static void node_shader_init_glossy(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_glossy(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = SHD_GLOSSY_GGX; } static int node_shader_gpu_bsdf_glossy(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc index 1a1ba13e886..f8a17e146f4 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc @@ -31,14 +31,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("BSDF")); } -static void node_shader_buts_hair(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_hair(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "component", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } static int node_shader_gpu_bsdf_hair(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc index 766c926916a..b1022a95783 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc @@ -63,15 +63,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("BSDF")); } -static void node_shader_buts_principled_hair(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) +static void node_shader_buts_principled_hair(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "parametrization", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } /* Initialize the custom Parametrization property to Color. */ -static void node_shader_init_hair_principled(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_hair_principled(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = SHD_PRINCIPLED_HAIR_REFLECTANCE; } @@ -110,7 +108,7 @@ static void node_shader_update_hair_principled(bNodeTree *ntree, bNode *node) static int node_shader_gpu_hair_principled(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc index 7b72d4b9be4..adf2a9e8a19 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc @@ -107,13 +107,13 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("BSDF")); } -static void node_shader_buts_principled(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_principled(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "distribution", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); uiItemR(layout, ptr, "subsurface_method", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } -static void node_shader_init_principled(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_principled(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = SHD_GLOSSY_GGX; node->custom2 = SHD_SUBSURFACE_RANDOM_WALK; @@ -125,7 +125,7 @@ static void node_shader_init_principled(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_bsdf_principled(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.cc index e814eb223e5..a7111fd398f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.cc @@ -19,14 +19,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("BSDF")); } -static void node_shader_init_refraction(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_refraction(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = SHD_GLOSSY_BECKMANN; } static int node_shader_gpu_bsdf_refraction(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc index c1c092e89c7..d0f70eb1c92 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc @@ -26,14 +26,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("BSDF")); } -static void node_shader_buts_toon(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_toon(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "component", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } static int node_shader_gpu_bsdf_toon(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.cc index fd0dd9f93de..b8a2bf8043e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.cc @@ -15,7 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_bsdf_translucent(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.cc index 291b3fdb2be..8824c744fd3 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.cc @@ -14,7 +14,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_bsdf_transparent(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.cc index c86d70aecbf..c4aaf371e46 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.cc @@ -20,7 +20,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_bsdf_velvet(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_bump.cc b/source/blender/nodes/shader/nodes/node_shader_bump.cc index ad2c56d96b5..5447198107b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bump.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bump.cc @@ -31,14 +31,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Normal")); } -static void node_shader_buts_bump(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_bump(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "invert", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, 0); } static int gpu_shader_bump(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_camera.cc b/source/blender/nodes/shader/nodes/node_shader_camera.cc index 99c82582456..4d99d5ad17f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_camera.cc +++ b/source/blender/nodes/shader/nodes/node_shader_camera.cc @@ -18,7 +18,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int gpu_shader_camera(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_clamp.cc b/source/blender/nodes/shader/nodes/node_shader_clamp.cc index c8785721dfb..7680c6f99c4 100644 --- a/source/blender/nodes/shader/nodes/node_shader_clamp.cc +++ b/source/blender/nodes/shader/nodes/node_shader_clamp.cc @@ -21,19 +21,19 @@ static void sh_node_clamp_declare(NodeDeclarationBuilder &b) b.add_output(N_("Result")); } -static void node_shader_buts_clamp(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_clamp(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "clamp_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } -static void node_shader_init_clamp(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_clamp(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = NODE_CLAMP_MINMAX; /* clamp type */ } static int gpu_shader_clamp(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc b/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc index d73ffd89288..096884591ab 100644 --- a/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc +++ b/source/blender/nodes/shader/nodes/node_shader_color_ramp.cc @@ -21,14 +21,14 @@ static void sh_node_valtorgb_declare(NodeDeclarationBuilder &b) b.add_output(N_("Alpha")); } -static void node_shader_init_valtorgb(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_valtorgb(bNodeTree * /*ntree*/, bNode *node) { node->storage = BKE_colorband_add(true); } static int gpu_shader_valtorgb(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -107,7 +107,7 @@ class ColorBandFunction : 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 &values = params.readonly_single_input(0, "Value"); MutableSpan colors = params.uninitialized_single_output( diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.cc b/source/blender/nodes/shader/nodes/node_shader_curves.cc index 4725aef5991..439f2002ebc 100644 --- a/source/blender/nodes/shader/nodes/node_shader_curves.cc +++ b/source/blender/nodes/shader/nodes/node_shader_curves.cc @@ -17,14 +17,14 @@ static void sh_node_curve_vec_declare(NodeDeclarationBuilder &b) b.add_output(N_("Vector")); } -static void node_shader_init_curve_vec(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_curve_vec(bNodeTree * /*ntree*/, bNode *node) { node->storage = BKE_curvemapping_add(3, -1.0f, -1.0f, 1.0f, 1.0f); } static int gpu_shader_curve_vec(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -78,7 +78,7 @@ class CurveVecFunction : 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 &fac = params.readonly_single_input(0, "Fac"); const VArray &vec_in = params.readonly_single_input(1, "Vector"); @@ -132,14 +132,14 @@ static void sh_node_curve_rgb_declare(NodeDeclarationBuilder &b) b.add_output(N_("Color")); } -static void node_shader_init_curve_rgb(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_curve_rgb(bNodeTree * /*ntree*/, bNode *node) { node->storage = BKE_curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f); } static int gpu_shader_curve_rgb(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -218,7 +218,7 @@ class CurveRGBFunction : 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 &fac = params.readonly_single_input(0, "Fac"); const VArray &col_in = params.readonly_single_input(1, @@ -278,14 +278,14 @@ static void sh_node_curve_float_declare(NodeDeclarationBuilder &b) b.add_output(N_("Value")); } -static void node_shader_init_curve_float(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_curve_float(bNodeTree * /*ntree*/, bNode *node) { node->storage = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); } static int gpu_shader_curve_float(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -339,7 +339,7 @@ class CurveFloatFunction : 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 &fac = params.readonly_single_input(0, "Factor"); const VArray &val_in = params.readonly_single_input(1, "Value"); diff --git a/source/blender/nodes/shader/nodes/node_shader_displacement.cc b/source/blender/nodes/shader/nodes/node_shader_displacement.cc index 6591396adda..fd5a6107447 100644 --- a/source/blender/nodes/shader/nodes/node_shader_displacement.cc +++ b/source/blender/nodes/shader/nodes/node_shader_displacement.cc @@ -14,7 +14,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Displacement")); } -static void node_shader_init_displacement(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_displacement(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = SHD_SPACE_OBJECT; /* space */ @@ -28,7 +28,7 @@ static void node_shader_init_displacement(bNodeTree *UNUSED(ntree), bNode *node) static int gpu_shader_displacement(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_eevee_specular.cc b/source/blender/nodes/shader/nodes/node_shader_eevee_specular.cc index d68b0c0c37c..e3b06aaae90 100644 --- a/source/blender/nodes/shader/nodes/node_shader_eevee_specular.cc +++ b/source/blender/nodes/shader/nodes/node_shader_eevee_specular.cc @@ -41,7 +41,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_eevee_specular(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_emission.cc b/source/blender/nodes/shader/nodes/node_shader_emission.cc index be98f096ce5..69c6094e92e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_emission.cc +++ b/source/blender/nodes/shader/nodes/node_shader_emission.cc @@ -15,7 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_emission(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_fresnel.cc b/source/blender/nodes/shader/nodes/node_shader_fresnel.cc index 7b771d7dafd..abbfc5ad1d5 100644 --- a/source/blender/nodes/shader/nodes/node_shader_fresnel.cc +++ b/source/blender/nodes/shader/nodes/node_shader_fresnel.cc @@ -14,7 +14,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_fresnel(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_gamma.cc b/source/blender/nodes/shader/nodes/node_shader_gamma.cc index d1e07c8b363..80419ed732c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_gamma.cc +++ b/source/blender/nodes/shader/nodes/node_shader_gamma.cc @@ -18,7 +18,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_gamma(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_geometry.cc b/source/blender/nodes/shader/nodes/node_shader_geometry.cc index d23561de7ff..e27b5290513 100644 --- a/source/blender/nodes/shader/nodes/node_shader_geometry.cc +++ b/source/blender/nodes/shader/nodes/node_shader_geometry.cc @@ -20,7 +20,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_geometry(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_hair_info.cc b/source/blender/nodes/shader/nodes/node_shader_hair_info.cc index f46556291ce..2ae87f7bc51 100644 --- a/source/blender/nodes/shader/nodes/node_shader_hair_info.cc +++ b/source/blender/nodes/shader/nodes/node_shader_hair_info.cc @@ -17,7 +17,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_hair_info(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_holdout.cc b/source/blender/nodes/shader/nodes/node_shader_holdout.cc index 6a21fab28db..ee754a7afa8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_holdout.cc +++ b/source/blender/nodes/shader/nodes/node_shader_holdout.cc @@ -13,7 +13,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int gpu_shader_rgb(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_hueSatVal.cc b/source/blender/nodes/shader/nodes/node_shader_hueSatVal.cc index a2220ebccc7..3e057d3d230 100644 --- a/source/blender/nodes/shader/nodes/node_shader_hueSatVal.cc +++ b/source/blender/nodes/shader/nodes/node_shader_hueSatVal.cc @@ -21,7 +21,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int gpu_shader_hue_sat(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_ies_light.cc b/source/blender/nodes/shader/nodes/node_shader_ies_light.cc index bc1d662a17a..65655ba2781 100644 --- a/source/blender/nodes/shader/nodes/node_shader_ies_light.cc +++ b/source/blender/nodes/shader/nodes/node_shader_ies_light.cc @@ -15,7 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Fac")); } -static void node_shader_buts_ies(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_ies(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *row; @@ -32,7 +32,7 @@ static void node_shader_buts_ies(uiLayout *layout, bContext *UNUSED(C), PointerR } } -static void node_shader_init_tex_ies(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_ies(bNodeTree * /*ntree*/, bNode *node) { NodeShaderTexIES *tex = MEM_cnew("NodeShaderIESLight"); node->storage = tex; diff --git a/source/blender/nodes/shader/nodes/node_shader_invert.cc b/source/blender/nodes/shader/nodes/node_shader_invert.cc index f87455b555d..adcb0508093 100644 --- a/source/blender/nodes/shader/nodes/node_shader_invert.cc +++ b/source/blender/nodes/shader/nodes/node_shader_invert.cc @@ -18,7 +18,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int gpu_shader_invert(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_layer_weight.cc b/source/blender/nodes/shader/nodes/node_shader_layer_weight.cc index 69825e472fb..5a56ee8bc75 100644 --- a/source/blender/nodes/shader/nodes/node_shader_layer_weight.cc +++ b/source/blender/nodes/shader/nodes/node_shader_layer_weight.cc @@ -15,7 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_layer_weight(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_light_falloff.cc b/source/blender/nodes/shader/nodes/node_shader_light_falloff.cc index 599becb4400..1ee096c052f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_light_falloff.cc +++ b/source/blender/nodes/shader/nodes/node_shader_light_falloff.cc @@ -16,7 +16,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_light_falloff(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_light_path.cc b/source/blender/nodes/shader/nodes/node_shader_light_path.cc index 1e4ecbd77b1..268a80af0ab 100644 --- a/source/blender/nodes/shader/nodes/node_shader_light_path.cc +++ b/source/blender/nodes/shader/nodes/node_shader_light_path.cc @@ -24,7 +24,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_light_path(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_map_range.cc b/source/blender/nodes/shader/nodes/node_shader_map_range.cc index 5fc69987c67..e0c1778f764 100644 --- a/source/blender/nodes/shader/nodes/node_shader_map_range.cc +++ b/source/blender/nodes/shader/nodes/node_shader_map_range.cc @@ -39,7 +39,7 @@ static void sh_node_map_range_declare(NodeDeclarationBuilder &b) b.add_output(N_("Vector")); } -static void node_shader_buts_map_range(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_map_range(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "data_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); uiItemR(layout, ptr, "interpolation_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); @@ -94,7 +94,7 @@ static void node_shader_update_map_range(bNodeTree *ntree, bNode *node) } } -static void node_shader_init_map_range(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_map_range(bNodeTree * /*ntree*/, bNode *node) { NodeMapRange *data = MEM_cnew(__func__); data->clamp = 1; @@ -197,7 +197,7 @@ static const char *gpu_shader_get_name(int mode, bool use_vector) static int gpu_shader_map_range(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_mapping.cc b/source/blender/nodes/shader/nodes/node_shader_mapping.cc index 7824ee4861c..89cd5af045b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mapping.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mapping.cc @@ -36,7 +36,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Vector")); } -static void node_shader_buts_mapping(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_mapping(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "vector_type", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); } @@ -58,7 +58,7 @@ static const char *gpu_shader_get_name(int mode) static int gpu_shader_mapping(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_math.cc b/source/blender/nodes/shader/nodes/node_shader_math.cc index bd83f8dac37..3f25da4652d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_math.cc @@ -82,7 +82,7 @@ static const char *gpu_shader_get_name(int mode) static int gpu_shader_math(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_mix.cc b/source/blender/nodes/shader/nodes/node_shader_mix.cc index f785e32832e..5ab26100a48 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix.cc @@ -50,7 +50,7 @@ static void sh_node_mix_declare(NodeDeclarationBuilder &b) b.add_output(N_("Result"), "Result_Color"); }; -static void sh_node_mix_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void sh_node_mix_layout(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { const NodeShaderMix &data = node_storage(*static_cast(ptr->data)); uiItemR(layout, ptr, "data_type", 0, "", ICON_NONE); @@ -67,7 +67,7 @@ static void sh_node_mix_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA } } -static void sh_node_mix_label(const bNodeTree *UNUSED(ntree), +static void sh_node_mix_label(const bNodeTree * /*ntree*/, const bNode *node, char *label, int maxlen) @@ -165,7 +165,7 @@ static void node_mix_gather_link_searches(GatherLinkSearchOpParams ¶ms) } } -static void node_mix_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_mix_init(bNodeTree * /*tree*/, bNode *node) { NodeShaderMix *data = MEM_cnew(__func__); data->data_type = SOCK_FLOAT; @@ -235,7 +235,7 @@ static const char *gpu_shader_get_name(eNodeSocketDatatype data_type, static int gpu_shader_mix(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -315,7 +315,7 @@ class MixColorFunction : 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 &fac = params.readonly_single_input(0, "Factor"); const VArray &col1 = params.readonly_single_input(1, "A"); diff --git a/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc index 46ac8f05803..ef0374e4539 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc @@ -64,7 +64,7 @@ static const char *gpu_shader_get_name(int mode) static int gpu_shader_mix_rgb(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -111,7 +111,7 @@ class MixRGBFunction : 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 &fac = params.readonly_single_input(0, "Fac"); const VArray &col1 = params.readonly_single_input(1, diff --git a/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc b/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc index 7740bf9b92a..27e41406b48 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix_shader.cc @@ -15,7 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_mix_shader(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_normal.cc b/source/blender/nodes/shader/nodes/node_shader_normal.cc index f6214dd9c89..49c075ac27e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_normal.cc +++ b/source/blender/nodes/shader/nodes/node_shader_normal.cc @@ -26,7 +26,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int gpu_shader_normal(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_normal_map.cc b/source/blender/nodes/shader/nodes/node_shader_normal_map.cc index d51d8def945..99cb5f6f525 100644 --- a/source/blender/nodes/shader/nodes/node_shader_normal_map.cc +++ b/source/blender/nodes/shader/nodes/node_shader_normal_map.cc @@ -34,7 +34,7 @@ static void node_shader_buts_normal_map(uiLayout *layout, bContext *C, PointerRN } } -static void node_shader_init_normal_map(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_normal_map(bNodeTree * /*ntree*/, bNode *node) { NodeShaderNormalMap *attr = MEM_cnew("NodeShaderNormalMap"); node->storage = attr; @@ -42,7 +42,7 @@ static void node_shader_init_normal_map(bNodeTree *UNUSED(ntree), bNode *node) static int gpu_shader_normal_map(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_object_info.cc b/source/blender/nodes/shader/nodes/node_shader_object_info.cc index 8985ab6d0e9..210f855b9e0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_object_info.cc +++ b/source/blender/nodes/shader/nodes/node_shader_object_info.cc @@ -17,7 +17,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_object_info(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_output_aov.cc b/source/blender/nodes/shader/nodes/node_shader_output_aov.cc index 78dabc5c1c2..cc95db9d333 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_aov.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_aov.cc @@ -16,12 +16,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input(N_("Value")).default_value(0.0f).min(0.0f).max(1.0f); } -static void node_shader_buts_output_aov(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_output_aov(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "name", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); } -static void node_shader_init_output_aov(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_output_aov(bNodeTree * /*ntree*/, bNode *node) { NodeShaderOutputAOV *aov = MEM_cnew("NodeShaderOutputAOV"); node->storage = aov; @@ -29,7 +29,7 @@ static void node_shader_init_output_aov(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_output_aov(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_output_light.cc b/source/blender/nodes/shader/nodes/node_shader_output_light.cc index 3707806841e..6e4483dbbe9 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_light.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_light.cc @@ -11,10 +11,10 @@ static void node_declare(NodeDeclarationBuilder &b) } static int node_shader_gpu_output_light(GPUMaterial *mat, - bNode *UNUSED(node), - bNodeExecData *UNUSED(execdata), + bNode * /*node*/, + bNodeExecData * /*execdata*/, GPUNodeStack *in, - GPUNodeStack *UNUSED(out)) + GPUNodeStack * /*out*/) { GPUNodeLink *outlink_surface; /* Passthrough node in order to do the right socket conversions. */ diff --git a/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc b/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc index b387aebf5e3..47909985374 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc @@ -28,7 +28,7 @@ static void node_declare(NodeDeclarationBuilder &b) .subtype(PROP_FACTOR); } -static void node_buts_output_linestyle(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_buts_output_linestyle(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *row, *col; diff --git a/source/blender/nodes/shader/nodes/node_shader_output_material.cc b/source/blender/nodes/shader/nodes/node_shader_output_material.cc index 133457c167f..857c5eb68df 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_material.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_material.cc @@ -16,10 +16,10 @@ static void node_declare(NodeDeclarationBuilder &b) } static int node_shader_gpu_output_material(GPUMaterial *mat, - bNode *UNUSED(node), - bNodeExecData *UNUSED(execdata), + bNode * /*node*/, + bNodeExecData * /*execdata*/, GPUNodeStack *in, - GPUNodeStack *UNUSED(out)) + GPUNodeStack * /*out*/) { GPUNodeLink *outlink_surface, *outlink_volume, *outlink_displacement, *outlink_thickness; /* Passthrough node in order to do the right socket conversions (important for displacement). */ diff --git a/source/blender/nodes/shader/nodes/node_shader_output_world.cc b/source/blender/nodes/shader/nodes/node_shader_output_world.cc index b0cf4c80bc5..f450e667cd9 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_world.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_world.cc @@ -12,10 +12,10 @@ static void node_declare(NodeDeclarationBuilder &b) } static int node_shader_gpu_output_world(GPUMaterial *mat, - bNode *UNUSED(node), - bNodeExecData *UNUSED(execdata), + bNode * /*node*/, + bNodeExecData * /*execdata*/, GPUNodeStack *in, - GPUNodeStack *UNUSED(out)) + GPUNodeStack * /*out*/) { GPUNodeLink *outlink_surface, *outlink_volume; if (in[0].link) { diff --git a/source/blender/nodes/shader/nodes/node_shader_particle_info.cc b/source/blender/nodes/shader/nodes/node_shader_particle_info.cc index 71adbd5e5c4..76a91ab60aa 100644 --- a/source/blender/nodes/shader/nodes/node_shader_particle_info.cc +++ b/source/blender/nodes/shader/nodes/node_shader_particle_info.cc @@ -24,7 +24,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int gpu_shader_particle_info(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_point_info.cc b/source/blender/nodes/shader/nodes/node_shader_point_info.cc index 1cddf2acc8a..05b649490e4 100644 --- a/source/blender/nodes/shader/nodes/node_shader_point_info.cc +++ b/source/blender/nodes/shader/nodes/node_shader_point_info.cc @@ -14,7 +14,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_point_info(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_rgb.cc index 3d28f5278a2..1adbbbc48bc 100644 --- a/source/blender/nodes/shader/nodes/node_shader_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_rgb.cc @@ -16,7 +16,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int gpu_shader_rgb(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack * /*in*/, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc b/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc index 7d738cdd719..1db3342733b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc +++ b/source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc @@ -19,7 +19,7 @@ static void sh_node_rgbtobw_declare(NodeDeclarationBuilder &b) static int gpu_shader_rgbtobw(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_script.cc b/source/blender/nodes/shader/nodes/node_shader_script.cc index 4d3d2af6aa6..8534ce129b4 100644 --- a/source/blender/nodes/shader/nodes/node_shader_script.cc +++ b/source/blender/nodes/shader/nodes/node_shader_script.cc @@ -12,7 +12,7 @@ namespace blender::nodes::node_shader_script_cc { -static void node_shader_buts_script(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_script(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *row; @@ -44,7 +44,7 @@ static void node_shader_buts_script_ex(uiLayout *layout, bContext *C, PointerRNA #endif } -static void init(bNodeTree *UNUSED(ntree), bNode *node) +static void init(bNodeTree * /*ntree*/, bNode *node) { NodeShaderScript *nss = MEM_cnew("shader script node"); node->storage = nss; @@ -63,9 +63,7 @@ static void node_free_script(bNode *node) } } -static void node_copy_script(bNodeTree *UNUSED(dest_ntree), - bNode *dest_node, - const bNode *src_node) +static void node_copy_script(bNodeTree * /*dst_ntree*/, bNode *dest_node, const bNode *src_node) { NodeShaderScript *src_nss = static_cast(src_node->storage); NodeShaderScript *dest_nss = static_cast(MEM_dupallocN(src_nss)); diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc b/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc index 8e378ebabce..77ce6f5e4e4 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc @@ -10,7 +10,7 @@ #include "UI_interface.h" #include "UI_resources.h" -static void node_combsep_color_init(bNodeTree *UNUSED(tree), bNode *node) +static void node_combsep_color_init(bNodeTree * /*tree*/, bNode *node) { NodeCombSepColor *data = MEM_cnew(__func__); data->mode = NODE_COMBSEP_COLOR_RGB; @@ -31,7 +31,7 @@ static void sh_node_sepcolor_declare(NodeDeclarationBuilder &b) b.add_output(N_("Blue")); } -static void node_sepcolor_update(bNodeTree *UNUSED(ntree), bNode *node) +static void node_sepcolor_update(bNodeTree * /*ntree*/, bNode *node) { const NodeCombSepColor &storage = node_storage(*node); node_combsep_color_label(&node->outputs, (NodeCombSepColorMode)storage.mode); @@ -53,7 +53,7 @@ static const char *gpu_shader_get_name(int mode) static int gpu_shader_sepcolor(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -107,7 +107,7 @@ static void sh_node_combcolor_declare(NodeDeclarationBuilder &b) b.add_output(N_("Color")); } -static void node_combcolor_update(bNodeTree *UNUSED(ntree), bNode *node) +static void node_combcolor_update(bNodeTree * /*ntree*/, bNode *node) { const NodeCombSepColor &storage = node_storage(*node); node_combsep_color_label(&node->inputs, (NodeCombSepColorMode)storage.mode); @@ -129,7 +129,7 @@ static const char *gpu_shader_get_name(int mode) static int gpu_shader_combcolor(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcomb_hsv.cc b/source/blender/nodes/shader/nodes/node_shader_sepcomb_hsv.cc index 1c02c5ba074..985342ac15d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_hsv.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_hsv.cc @@ -21,7 +21,7 @@ static void node_declare_sephsv(NodeDeclarationBuilder &b) static int gpu_shader_sephsv(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -58,7 +58,7 @@ static void node_declare_combhsv(NodeDeclarationBuilder &b) static int gpu_shader_combhsv(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc index 3fe76b05b5d..07586a54765 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc @@ -20,7 +20,7 @@ static void sh_node_seprgb_declare(NodeDeclarationBuilder &b) static int gpu_shader_seprgb(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -45,7 +45,7 @@ class SeparateRGBFunction : 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 &colors = params.readonly_single_input(0, "Color"); @@ -98,7 +98,7 @@ static void sh_node_combrgb_declare(NodeDeclarationBuilder &b) static int gpu_shader_combrgb(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc b/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc index d4413036555..8849824ec0b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc @@ -20,7 +20,7 @@ static void sh_node_sepxyz_declare(NodeDeclarationBuilder &b) static int gpu_shader_sepxyz(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -45,7 +45,7 @@ class MF_SeparateXYZ : 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 &vectors = params.readonly_single_input(0, "XYZ"); MutableSpan xs = params.uninitialized_single_output_if_required(1, "X"); @@ -116,7 +116,7 @@ static void sh_node_combxyz_declare(NodeDeclarationBuilder &b) static int gpu_shader_combxyz(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc index 0404158a803..7345e374937 100644 --- a/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc @@ -14,7 +14,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_shadertorgb(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_squeeze.cc b/source/blender/nodes/shader/nodes/node_shader_squeeze.cc index c22420d8d47..62e21088791 100644 --- a/source/blender/nodes/shader/nodes/node_shader_squeeze.cc +++ b/source/blender/nodes/shader/nodes/node_shader_squeeze.cc @@ -19,7 +19,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int gpu_shader_squeeze(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc index e3ff4c28604..29d42b20a80 100644 --- a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc +++ b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc @@ -29,12 +29,12 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("BSSRDF")); } -static void node_shader_buts_subsurface(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_subsurface(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "falloff", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } -static void node_shader_init_subsurface_scattering(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_subsurface_scattering(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = SHD_SUBSURFACE_RANDOM_WALK; node->custom2 = true; @@ -42,7 +42,7 @@ static void node_shader_init_subsurface_scattering(bNodeTree *UNUSED(ntree), bNo static int node_shader_gpu_subsurface_scattering(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_tangent.cc b/source/blender/nodes/shader/nodes/node_shader_tangent.cc index 8e27ebed21b..c2116c9c0ff 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tangent.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tangent.cc @@ -41,7 +41,7 @@ static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA * } } -static void node_shader_init_tangent(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tangent(bNodeTree * /*ntree*/, bNode *node) { NodeShaderTangent *attr = MEM_cnew("NodeShaderTangent"); attr->axis = SHD_TANGENT_AXIS_Z; @@ -50,7 +50,7 @@ static void node_shader_init_tangent(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_tangent(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc b/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc index 5a7ec408433..f6bcedbd19e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc @@ -46,7 +46,7 @@ static void sh_node_tex_brick_declare(NodeDeclarationBuilder &b) b.add_output(N_("Fac")); } -static void node_shader_buts_tex_brick(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_tex_brick(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiLayout *col; @@ -66,7 +66,7 @@ static void node_shader_buts_tex_brick(uiLayout *layout, bContext *UNUSED(C), Po col, ptr, "squash_frequency", UI_ITEM_R_SPLIT_EMPTY_NAME, IFACE_("Frequency"), ICON_NONE); } -static void node_shader_init_tex_brick(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_brick(bNodeTree * /*ntree*/, bNode *node) { NodeTexBrick *tex = MEM_cnew(__func__); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); @@ -88,7 +88,7 @@ static void node_shader_init_tex_brick(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_tex_brick(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -203,7 +203,7 @@ class BrickFunction : public fn::MultiFunction { return float2(tint, mortar); } - 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 &vector = params.readonly_single_input(0, "Vector"); const VArray &color1_values = params.readonly_single_input( diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc b/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc index fc231d79417..c48f79698bb 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_checker.cc @@ -23,7 +23,7 @@ static void sh_node_tex_checker_declare(NodeDeclarationBuilder &b) b.add_output(N_("Fac")); } -static void node_shader_init_tex_checker(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_checker(bNodeTree * /*ntree*/, bNode *node) { NodeTexChecker *tex = MEM_cnew(__func__); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); @@ -34,7 +34,7 @@ static void node_shader_init_tex_checker(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_tex_checker(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -64,7 +64,7 @@ class NodeTexChecker : 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 &vector = params.readonly_single_input(0, "Vector"); const VArray &color1 = params.readonly_single_input( diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc b/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc index 9727a6089a6..e2a40b79d53 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc @@ -21,7 +21,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Reflection")); } -static void node_shader_buts_tex_coord(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_tex_coord(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "object", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, 0); uiItemR(layout, ptr, "from_instancer", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, 0); @@ -29,7 +29,7 @@ static void node_shader_buts_tex_coord(uiLayout *layout, bContext *UNUSED(C), Po static int node_shader_gpu_tex_coord(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_environment.cc b/source/blender/nodes/shader/nodes/node_shader_tex_environment.cc index 2739a75ed21..a145bce3f6f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_environment.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_environment.cc @@ -11,7 +11,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Color")).no_muted_links(); } -static void node_shader_init_tex_environment(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_environment(bNodeTree * /*ntree*/, bNode *node) { NodeTexEnvironment *tex = MEM_cnew("NodeTexEnvironment"); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); @@ -24,7 +24,7 @@ static void node_shader_init_tex_environment(bNodeTree *UNUSED(ntree), bNode *no static int node_shader_gpu_tex_environment(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc index bc7837040b7..75c469fe665 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc @@ -18,12 +18,12 @@ static void sh_node_tex_gradient_declare(NodeDeclarationBuilder &b) b.add_output(N_("Fac")).no_muted_links(); } -static void node_shader_buts_tex_gradient(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_tex_gradient(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "gradient_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } -static void node_shader_init_tex_gradient(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_gradient(bNodeTree * /*ntree*/, bNode *node) { NodeTexGradient *tex = MEM_cnew(__func__); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); @@ -35,7 +35,7 @@ static void node_shader_init_tex_gradient(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_tex_gradient(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -67,7 +67,7 @@ class GradientFunction : 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 &vector = params.readonly_single_input(0, "Vector"); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.cc b/source/blender/nodes/shader/nodes/node_shader_tex_image.cc index e70539fcf25..80398871625 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_image.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.cc @@ -13,7 +13,7 @@ static void sh_node_tex_image_declare(NodeDeclarationBuilder &b) b.add_output(N_("Alpha")).no_muted_links(); } -static void node_shader_init_tex_image(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_image(bNodeTree * /*ntree*/, bNode *node) { NodeTexImage *tex = MEM_cnew(__func__); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); @@ -25,7 +25,7 @@ static void node_shader_init_tex_image(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_tex_image(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc index 86c96cfe70b..b2ba0e52f02 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc @@ -18,12 +18,12 @@ static void sh_node_tex_magic_declare(NodeDeclarationBuilder &b) b.add_output(N_("Fac")).no_muted_links(); } -static void node_shader_buts_tex_magic(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_tex_magic(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "turbulence_depth", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); } -static void node_shader_init_tex_magic(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_magic(bNodeTree * /*ntree*/, bNode *node) { NodeTexMagic *tex = MEM_cnew(__func__); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); @@ -35,7 +35,7 @@ static void node_shader_init_tex_magic(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_tex_magic(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -70,7 +70,7 @@ class MagicFunction : 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 &vector = params.readonly_single_input(0, "Vector"); const VArray &scale = params.readonly_single_input(1, "Scale"); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc index 86a79a3f213..9a7573fc870 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc @@ -31,13 +31,13 @@ static void sh_node_tex_musgrave_declare(NodeDeclarationBuilder &b) b.add_output(N_("Fac")).no_muted_links(); } -static void node_shader_buts_tex_musgrave(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_tex_musgrave(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "musgrave_dimensions", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); uiItemR(layout, ptr, "musgrave_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } -static void node_shader_init_tex_musgrave(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_musgrave(bNodeTree * /*ntree*/, bNode *node) { NodeTexMusgrave *tex = MEM_cnew(__func__); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); @@ -85,7 +85,7 @@ static const char *gpu_shader_name_get(const int type, const int dimensions) static int node_shader_gpu_tex_musgrave(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -194,7 +194,7 @@ class MusgraveFunction : 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 { auto get_vector = [&](int param_index) -> VArray { return params.readonly_single_input(param_index, "Vector"); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc index eabe1fa774f..684c122f7fe 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc @@ -32,12 +32,12 @@ static void sh_node_tex_noise_declare(NodeDeclarationBuilder &b) b.add_output(N_("Color")).no_muted_links(); } -static void node_shader_buts_tex_noise(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_tex_noise(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "noise_dimensions", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } -static void node_shader_init_tex_noise(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_noise(bNodeTree * /*ntree*/, bNode *node) { NodeTexNoise *tex = MEM_cnew(__func__); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); @@ -59,7 +59,7 @@ static const char *gpu_shader_get_name(const int dimensions) static int node_shader_gpu_tex_noise(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -120,7 +120,7 @@ class NoiseFunction : 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 { int param = ELEM(dimensions_, 2, 3, 4) + ELEM(dimensions_, 1, 4); const VArray &scale = params.readonly_single_input(param++, "Scale"); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc index fcd1d4973ff..0d10d5a5047 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc @@ -17,9 +17,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Density")); } -static void node_shader_buts_tex_pointdensity(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) +static void node_shader_buts_tex_pointdensity(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { bNode *node = (bNode *)ptr->data; NodeShaderTexPointDensity *shader_point_density = (NodeShaderTexPointDensity *)node->storage; @@ -63,7 +61,7 @@ static void node_shader_buts_tex_pointdensity(uiLayout *layout, } } -static void node_shader_init_tex_pointdensity(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_pointdensity(bNodeTree * /*ntree*/, bNode *node) { NodeShaderTexPointDensity *point_density = MEM_new("new pd node"); point_density->resolution = 100; @@ -83,7 +81,7 @@ static void node_shader_free_tex_pointdensity(bNode *node) MEM_freeN(point_density); } -static void node_shader_copy_tex_pointdensity(bNodeTree *UNUSED(dest_ntree), +static void node_shader_copy_tex_pointdensity(bNodeTree * /*dst_ntree*/, bNode *dest_node, const bNode *src_node) { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc b/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc index 23fb4052c7e..44df6b2b1a1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc @@ -62,7 +62,7 @@ static void node_shader_buts_tex_sky(uiLayout *layout, bContext *C, PointerRNA * } } -static void node_shader_init_tex_sky(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_sky(bNodeTree * /*ntree*/, bNode *node) { NodeTexSky *tex = MEM_cnew("NodeTexSky"); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); @@ -146,7 +146,7 @@ static void sky_precompute_old(SkyModelPreetham *sunsky, const float sun_angles[ static int node_shader_gpu_tex_sky(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc index 723cf9322f8..0ef73f0c5ef 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc @@ -51,7 +51,7 @@ static void sh_node_tex_voronoi_declare(NodeDeclarationBuilder &b) }); } -static void node_shader_buts_tex_voronoi(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_tex_voronoi(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "voronoi_dimensions", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); uiItemR(layout, ptr, "feature", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); @@ -62,7 +62,7 @@ static void node_shader_buts_tex_voronoi(uiLayout *layout, bContext *UNUSED(C), } } -static void node_shader_init_tex_voronoi(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_voronoi(bNodeTree * /*ntree*/, bNode *node) { NodeTexVoronoi *tex = MEM_cnew(__func__); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); @@ -121,7 +121,7 @@ static const char *gpu_shader_get_name(const int feature, const int dimensions) static int node_shader_gpu_tex_voronoi(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -236,7 +236,7 @@ class VoronoiMinowskiFunction : 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 { auto get_vector = [&](int param_index) -> VArray { return params.readonly_single_input(param_index, "Vector"); @@ -672,7 +672,7 @@ class VoronoiMetricFunction : 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 { auto get_vector = [&](int param_index) -> VArray { return params.readonly_single_input(param_index, "Vector"); @@ -1179,7 +1179,7 @@ class VoronoiEdgeFunction : 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 { auto get_vector = [&](int param_index) -> VArray { return params.readonly_single_input(param_index, "Vector"); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc b/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc index d86b2d820ab..91dbc149f78 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc @@ -28,7 +28,7 @@ static void sh_node_tex_wave_declare(NodeDeclarationBuilder &b) b.add_output(N_("Fac")).no_muted_links(); } -static void node_shader_buts_tex_wave(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_tex_wave(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "wave_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); int type = RNA_enum_get(ptr, "wave_type"); @@ -42,7 +42,7 @@ static void node_shader_buts_tex_wave(uiLayout *layout, bContext *UNUSED(C), Poi uiItemR(layout, ptr, "wave_profile", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } -static void node_shader_init_tex_wave(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_wave(bNodeTree * /*ntree*/, bNode *node) { NodeTexWave *tex = MEM_cnew(__func__); BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); @@ -56,7 +56,7 @@ static void node_shader_init_tex_wave(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_tex_wave(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -113,7 +113,7 @@ class WaveFunction : 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 &vector = params.readonly_single_input(0, "Vector"); const VArray &scale = params.readonly_single_input(1, "Scale"); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc b/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc index d7f985d73fa..9a026567682 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc @@ -25,12 +25,12 @@ static void sh_node_tex_white_noise_declare(NodeDeclarationBuilder &b) b.add_output(N_("Color")); } -static void node_shader_buts_white_noise(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_white_noise(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "noise_dimensions", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } -static void node_shader_init_tex_white_noise(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_tex_white_noise(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = 3; } @@ -46,7 +46,7 @@ static const char *gpu_shader_get_name(const int dimensions) static int gpu_shader_tex_white_noise(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { @@ -97,7 +97,7 @@ class WhiteNoiseFunction : 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 { int param = ELEM(dimensions_, 2, 3, 4) + ELEM(dimensions_, 1, 4); diff --git a/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc b/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc index fa98cb3aa27..6923d51ab51 100644 --- a/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc +++ b/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc @@ -13,7 +13,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("UV")); } -static void node_shader_buts_uvalongstroke(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_uvalongstroke(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "use_tips", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, 0); } diff --git a/source/blender/nodes/shader/nodes/node_shader_uvmap.cc b/source/blender/nodes/shader/nodes/node_shader_uvmap.cc index 53228f0a314..e9d2b32bfd7 100644 --- a/source/blender/nodes/shader/nodes/node_shader_uvmap.cc +++ b/source/blender/nodes/shader/nodes/node_shader_uvmap.cc @@ -31,7 +31,7 @@ static void node_shader_buts_uvmap(uiLayout *layout, bContext *C, PointerRNA *pt } } -static void node_shader_init_uvmap(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_uvmap(bNodeTree * /*ntree*/, bNode *node) { NodeShaderUVMap *attr = MEM_cnew("NodeShaderUVMap"); node->storage = attr; @@ -39,7 +39,7 @@ static void node_shader_init_uvmap(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_uvmap(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_value.cc b/source/blender/nodes/shader/nodes/node_shader_value.cc index 14dbb3b25eb..0cd1a1f05f8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_value.cc +++ b/source/blender/nodes/shader/nodes/node_shader_value.cc @@ -16,7 +16,7 @@ static void sh_node_value_declare(NodeDeclarationBuilder &b) static int gpu_shader_value(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack * /*in*/, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_displacement.cc b/source/blender/nodes/shader/nodes/node_shader_vector_displacement.cc index 9996e91177a..64484f83320 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_displacement.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_displacement.cc @@ -13,14 +13,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Displacement")); } -static void node_shader_init_vector_displacement(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_vector_displacement(bNodeTree * /*ntree*/, bNode *node) { node->custom1 = SHD_SPACE_TANGENT; /* space */ } static int gpu_shader_vector_displacement(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc index d01e03f9d71..42b84617996 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc @@ -28,7 +28,7 @@ static void sh_node_vector_math_declare(NodeDeclarationBuilder &b) b.add_output(N_("Value")); } -static void node_shader_buts_vect_math(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_vect_math(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "operation", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } @@ -141,7 +141,7 @@ static const char *gpu_shader_get_name(int mode) static int gpu_shader_vector_math(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc index a036fc52d84..218ed0e54c9 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc @@ -29,7 +29,7 @@ static void sh_node_vector_rotate_declare(NodeDeclarationBuilder &b) b.add_output(N_("Vector")); } -static void node_shader_buts_vector_rotate(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_vector_rotate(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "rotation_type", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); uiItemR(layout, ptr, "invert", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, 0); @@ -55,7 +55,7 @@ static const char *gpu_shader_get_name(int mode) static int gpu_shader_vector_rotate(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc b/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc index 159bd238212..9037c6208fb 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc @@ -21,7 +21,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Vector")); } -static void node_shader_buts_vect_transform(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_vect_transform(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, @@ -33,7 +33,7 @@ static void node_shader_buts_vect_transform(uiLayout *layout, bContext *UNUSED(C uiItemR(layout, ptr, "convert_to", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); } -static void node_shader_init_vect_transform(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_vect_transform(bNodeTree * /*ntree*/, bNode *node) { NodeShaderVectTransform *vect = MEM_cnew("NodeShaderVectTransform"); @@ -88,7 +88,7 @@ static const char *get_gpufn_name_from_to(short from, short to, bool is_directio static int gpu_shader_vect_transform(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc index c636cc976e6..6e2325bddf9 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc @@ -29,7 +29,7 @@ static void node_shader_buts_vertex_color(uiLayout *layout, bContext *C, Pointer } } -static void node_shader_init_vertex_color(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_vertex_color(bNodeTree * /*ntree*/, bNode *node) { NodeShaderVertexColor *vertexColor = MEM_cnew("NodeShaderVertexColor"); node->storage = vertexColor; @@ -37,7 +37,7 @@ static void node_shader_init_vertex_color(bNodeTree *UNUSED(ntree), bNode *node) static int node_shader_gpu_vertex_color(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_absorption.cc b/source/blender/nodes/shader/nodes/node_shader_volume_absorption.cc index 930fa6e5fb9..d6a29f537ff 100644 --- a/source/blender/nodes/shader/nodes/node_shader_volume_absorption.cc +++ b/source/blender/nodes/shader/nodes/node_shader_volume_absorption.cc @@ -15,7 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_volume_absorption(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_info.cc b/source/blender/nodes/shader/nodes/node_shader_volume_info.cc index 1f31e9c605f..9f1feedc336 100644 --- a/source/blender/nodes/shader/nodes/node_shader_volume_info.cc +++ b/source/blender/nodes/shader/nodes/node_shader_volume_info.cc @@ -14,9 +14,9 @@ static void node_declare(NodeDeclarationBuilder &b) } static int node_shader_gpu_volume_info(GPUMaterial *mat, - bNode *UNUSED(node), - bNodeExecData *UNUSED(execdata), - GPUNodeStack *UNUSED(in), + bNode * /*node*/, + bNodeExecData * /*execdata*/, + GPUNodeStack * /*in*/, GPUNodeStack *out) { if (out[0].hasoutput) { diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_principled.cc b/source/blender/nodes/shader/nodes/node_shader_volume_principled.cc index 4c4122a905f..2c5811045f0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_volume_principled.cc +++ b/source/blender/nodes/shader/nodes/node_shader_volume_principled.cc @@ -33,7 +33,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Volume")); } -static void node_shader_init_volume_principled(bNodeTree *UNUSED(ntree), bNode *node) +static void node_shader_init_volume_principled(bNodeTree * /*ntree*/, bNode *node) { LISTBASE_FOREACH (bNodeSocket *, sock, &node->inputs) { if (STREQ(sock->name, "Density Attribute")) { @@ -59,7 +59,7 @@ static void attribute_post_process(GPUMaterial *mat, static int node_shader_gpu_volume_principled(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_scatter.cc b/source/blender/nodes/shader/nodes/node_shader_volume_scatter.cc index 0c6859ad1fb..1322a73ac37 100644 --- a/source/blender/nodes/shader/nodes/node_shader_volume_scatter.cc +++ b/source/blender/nodes/shader/nodes/node_shader_volume_scatter.cc @@ -20,7 +20,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_volume_scatter(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_wavelength.cc b/source/blender/nodes/shader/nodes/node_shader_wavelength.cc index 34fa639dd07..43bb4798e3f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_wavelength.cc +++ b/source/blender/nodes/shader/nodes/node_shader_wavelength.cc @@ -15,7 +15,7 @@ static void node_declare(NodeDeclarationBuilder &b) static int node_shader_gpu_wavelength(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/nodes/shader/nodes/node_shader_wireframe.cc b/source/blender/nodes/shader/nodes/node_shader_wireframe.cc index 6a1acda3353..ddabebfeec2 100644 --- a/source/blender/nodes/shader/nodes/node_shader_wireframe.cc +++ b/source/blender/nodes/shader/nodes/node_shader_wireframe.cc @@ -14,14 +14,14 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_output(N_("Fac")); } -static void node_shader_buts_wireframe(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +static void node_shader_buts_wireframe(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "use_pixel_size", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, 0); } static int node_shader_gpu_wireframe(GPUMaterial *mat, bNode *node, - bNodeExecData *UNUSED(execdata), + bNodeExecData * /*execdata*/, GPUNodeStack *in, GPUNodeStack *out) { diff --git a/source/blender/python/gpu/gpu_py_shader_create_info.cc b/source/blender/python/gpu/gpu_py_shader_create_info.cc index afef873ab6b..6b1be057752 100644 --- a/source/blender/python/gpu/gpu_py_shader_create_info.cc +++ b/source/blender/python/gpu/gpu_py_shader_create_info.cc @@ -281,8 +281,7 @@ PyDoc_STRVAR(pygpu_interface_info_name_doc, "Name of the interface block.\n" "\n" ":type: str"); -static PyObject *pygpu_interface_info_name_get(BPyGPUStageInterfaceInfo *self, - void *UNUSED(closure)) +static PyObject *pygpu_interface_info_name_get(BPyGPUStageInterfaceInfo *self, void * /*closure*/) { StageInterfaceInfo *interface = reinterpret_cast(self->interface); return PyUnicode_FromString(interface->name.c_str()); @@ -303,7 +302,7 @@ static PyGetSetDef pygpu_interface_info__tp_getseters[] = { /** \name GPUStageInterfaceInfo Type * \{ */ -static PyObject *pygpu_interface_info__tp_new(PyTypeObject *UNUSED(type), +static PyObject *pygpu_interface_info__tp_new(PyTypeObject * /*type*/, PyObject *args, PyObject *kwds) { @@ -1017,9 +1016,7 @@ static struct PyMethodDef pygpu_shader_info__tp_methods[] = { /** \name GPUShaderCreateInfo Initialization * \{ */ -static PyObject *pygpu_shader_info__tp_new(PyTypeObject *UNUSED(type), - PyObject *args, - PyObject *kwds) +static PyObject *pygpu_shader_info__tp_new(PyTypeObject * /*type*/, PyObject *args, PyObject *kwds) { if (PyTuple_Size(args) || kwds) { PyErr_SetString(PyExc_TypeError, "no args or keywords are expected"); diff --git a/source/blender/render/intern/engine.cc b/source/blender/render/intern/engine.cc index 10a4788ef77..5eb4db6faa4 100644 --- a/source/blender/render/intern/engine.cc +++ b/source/blender/render/intern/engine.cc @@ -306,7 +306,7 @@ static void render_result_to_bake(RenderEngine *engine, RenderResult *rr) /* Render Results */ -static HighlightedTile highlighted_tile_from_result_get(Render *UNUSED(re), RenderResult *result) +static HighlightedTile highlighted_tile_from_result_get(Render * /*re*/, RenderResult *result) { HighlightedTile tile; tile.rect = result->tilerect; diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index 3dca26356df..baa89d5c845 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -162,29 +162,27 @@ static bool do_write_image_or_movie(Render *re, const char *name_override); /* default callbacks, set in each new render */ -static void result_nothing(void *UNUSED(arg), RenderResult *UNUSED(rr)) +static void result_nothing(void * /*arg*/, RenderResult * /*rr*/) { } -static void result_rcti_nothing(void *UNUSED(arg), - RenderResult *UNUSED(rr), - struct rcti *UNUSED(rect)) +static void result_rcti_nothing(void * /*arg*/, RenderResult * /*rr*/, struct rcti * /*rect*/) { } -static void current_scene_nothing(void *UNUSED(arg), Scene *UNUSED(scene)) +static void current_scene_nothing(void * /*arg*/, Scene * /*scene*/) { } -static void stats_nothing(void *UNUSED(arg), RenderStats *UNUSED(rs)) +static void stats_nothing(void * /*arg*/, RenderStats * /*rs*/) { } -static void float_nothing(void *UNUSED(arg), float UNUSED(val)) +static void float_nothing(void * /*arg*/, float /*val*/) { } -static int default_break(void *UNUSED(arg)) +static int default_break(void * /*arg*/) { return G.is_break == true; } -static void stats_background(void *UNUSED(arg), RenderStats *rs) +static void stats_background(void * /*arg*/, RenderStats *rs) { if (rs->infostr == nullptr) { return; @@ -1610,7 +1608,7 @@ bool RE_is_rendering_allowed(Scene *scene, static void update_physics_cache(Render *re, Scene *scene, ViewLayer *view_layer, - int UNUSED(anim_init)) + int /*anim_init*/) { PTCacheBaker baker; diff --git a/source/blender/simulation/intern/SIM_mass_spring.cpp b/source/blender/simulation/intern/SIM_mass_spring.cpp index b1782d67a04..8e2c7d641ab 100644 --- a/source/blender/simulation/intern/SIM_mass_spring.cpp +++ b/source/blender/simulation/intern/SIM_mass_spring.cpp @@ -175,7 +175,7 @@ static float cloth_calc_average_pressure(ClothModifierData *clmd, const float *v return total_force / total_area; } -int SIM_cloth_solver_init(Object *UNUSED(ob), ClothModifierData *clmd) +int SIM_cloth_solver_init(Object * /*ob*/, ClothModifierData *clmd) { Cloth *cloth = clmd->clothObject; ClothVertex *verts = cloth->verts; @@ -271,11 +271,8 @@ static void cloth_setup_constraints(ClothModifierData *clmd) * (edge distance constraints) in a lagrangian solver. Then add forces to help * guide the implicit solver to that state. This function is called after collisions. */ -static int UNUSED_FUNCTION(cloth_calc_helper_forces)(Object *UNUSED(ob), - ClothModifierData *clmd, - float (*initial_cos)[3], - float UNUSED(step), - float dt) +static int UNUSED_FUNCTION(cloth_calc_helper_forces)( + Object * /*ob*/, ClothModifierData *clmd, float (*initial_cos)[3], float /*step*/, float dt) { Cloth *cloth = clmd->clothObject; float(*cos)[3] = (float(*)[3])MEM_callocN(sizeof(float[3]) * cloth->mvert_num, @@ -564,7 +561,7 @@ static void hair_get_boundbox(ClothModifierData *clmd, float gmin[3], float gmax } static void cloth_calc_force( - Scene *scene, ClothModifierData *clmd, float UNUSED(frame), ListBase *effectors, float time) + Scene *scene, ClothModifierData *clmd, float /*frame*/, ListBase *effectors, float time) { /* Collect forces and derivatives: F, dFdX, dFdV */ Cloth *cloth = clmd->clothObject; diff --git a/source/blender/windowmanager/intern/wm_dragdrop.cc b/source/blender/windowmanager/intern/wm_dragdrop.cc index f7d484e9b7a..63f3bbe2c92 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.cc +++ b/source/blender/windowmanager/intern/wm_dragdrop.cc @@ -471,7 +471,7 @@ void wm_drop_prepare(bContext *C, wmDrag *drag, wmDropBox *drop) wm_drags_exit(CTX_wm_manager(C), CTX_wm_window(C)); } -void wm_drop_end(bContext *C, wmDrag *UNUSED(drag), wmDropBox *UNUSED(drop)) +void wm_drop_end(bContext *C, wmDrag */*drag*/, wmDropBox */*drop*/) { CTX_store_set(C, nullptr); } @@ -496,7 +496,7 @@ void wm_drags_check_ops(bContext *C, const wmEvent *event) } } -wmOperatorCallContext wm_drop_operator_context_get(const wmDropBox *UNUSED(drop)) +wmOperatorCallContext wm_drop_operator_context_get(const wmDropBox */*drop*/) { return WM_OP_INVOKE_DEFAULT; } @@ -818,8 +818,8 @@ static int wm_drag_imbuf_icon_height_get(const wmDrag *drag) return round_fl_to_int(drag->imb->y * drag->imbuf_scale); } -static void wm_drag_draw_icon(bContext *UNUSED(C), - wmWindow *UNUSED(win), +static void wm_drag_draw_icon(bContext * /*C*/, + wmWindow */*win*/, wmDrag *drag, const int xy[2]) { @@ -867,8 +867,8 @@ static void wm_drag_draw_item_name(wmDrag *drag, const int x, const int y) UI_fontstyle_draw_simple(fstyle, x, y, WM_drag_get_item_name(drag), text_col); } -void WM_drag_draw_item_name_fn(bContext *UNUSED(C), - wmWindow *UNUSED(win), +void WM_drag_draw_item_name_fn(bContext * /*C*/, + wmWindow */*win*/, wmDrag *drag, const int xy[2]) { diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index 38e37d73eb9..6a10680fc8b 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -359,7 +359,7 @@ void WM_main_remove_notifier_reference(const void *reference) } } -static void wm_main_remap_assetlist(ID *old_id, ID *new_id, void *UNUSED(user_data)) +static void wm_main_remap_assetlist(ID *old_id, ID *new_id, void * /*user_data*/) { ED_assetlist_storage_id_remap(old_id, new_id); } @@ -1226,7 +1226,7 @@ int WM_operator_repeat_last(bContext *C, wmOperator *op) op->flag &= ~op_flag; return ret; } -bool WM_operator_repeat_check(const bContext *UNUSED(C), wmOperator *op) +bool WM_operator_repeat_check(const bContext * /*C*/, wmOperator *op) { if (op->type->exec != nullptr) { return true; @@ -4457,7 +4457,7 @@ wmEventHandler_Keymap *WM_event_add_keymap_handler_dynamic( wmEventHandler_Keymap *WM_event_add_keymap_handler_priority(ListBase *handlers, wmKeyMap *keymap, - int UNUSED(priority)) + int /*priority*/) { WM_event_remove_keymap_handler(handlers, keymap); -- cgit v1.2.3