diff options
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_add.cc | 8 | ||||
-rw-r--r-- | source/blender/editors/object/object_modifier.cc | 54 | ||||
-rw-r--r-- | source/blender/editors/object/object_remesh.cc | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_transform.cc | 8 | ||||
-rw-r--r-- | source/blender/editors/object/object_vgroup.cc | 38 |
5 files changed, 54 insertions, 56 deletions
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<Mesh *>(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<Mesh *>(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<VoxelSizeEditCustomData *>(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); |