diff options
author | Hans Goudey <h.goudey@me.com> | 2021-07-05 18:27:27 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-07-05 18:27:27 +0300 |
commit | 941c4188ad3d8a87e35d380ecf7ccd14a9f25d9d (patch) | |
tree | ebc16d7cd38ae10f354703cec27ace843083503b /source/blender/editors | |
parent | 3f1614e788fed54ddf45bd57f11376df8bd93f90 (diff) |
Rename functions "for_read" -> "" and "for_write" -> "mutable"
Diffstat (limited to 'source/blender/editors')
10 files changed, 35 insertions, 35 deletions
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index 615265624fd..d223f326bbb 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -1523,7 +1523,7 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf) point2D = (tGPspoint *)tgpf->sbuffer; const int def_nr = tgpf->gpd->vertex_group_active_index - 1; - const ListBase *defbase = BKE_object_defgroup_list_for_read(tgpf->ob); + const ListBase *defbase = BKE_object_defgroup_list(tgpf->ob); const bool have_weight = (bool)BLI_findlink(defbase, def_nr); if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS) && (have_weight)) { diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 693d749a693..78eaab01b1a 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -1316,7 +1316,7 @@ static void gpencil_primitive_interaction_end(bContext *C, BrushGpencilSettings *brush_settings = brush->gpencil_settings; const int def_nr = tgpi->gpd->vertex_group_active_index - 1; - const ListBase *defbase = BKE_object_defgroup_list_for_read(tgpi->ob); + const ListBase *defbase = BKE_object_defgroup_list(tgpi->ob); const bool have_weight = (bool)BLI_findlink(defbase, def_nr); /* return to normal cursor and header status */ diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index ff617d0f8a0..132a442343c 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -4740,7 +4740,7 @@ static bool edbm_select_ungrouped_poll(bContext *C) BMEditMesh *em = BKE_editmesh_from_object(obedit); const int cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT); - const ListBase *defbase = BKE_object_defgroup_list_for_read(obedit); + const ListBase *defbase = BKE_object_defgroup_list(obedit); if ((em->selectmode & SCE_SELECT_VERTEX) == 0) { CTX_wm_operator_poll_msg_set(C, "Must be in vertex selection mode"); } diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c index 7bf5ac8bd7d..f52ab48785d 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.c +++ b/source/blender/editors/mesh/editmesh_select_similar.c @@ -1091,7 +1091,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) /* We store the names of the vertex groups, so we can select * vertex groups with the same name in different objects. */ - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); int i = 0; LISTBASE_FOREACH (bDeformGroup *, dg, defbase) { @@ -1131,7 +1131,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) if (cd_dvert_offset == -1) { continue; } - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); defbase_len = BLI_listbase_count(defbase); if (defbase_len == 0) { continue; diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c index 1307303e5a5..2109fe2a822 100644 --- a/source/blender/editors/object/object_data_transfer.c +++ b/source/blender/editors/object/object_data_transfer.c @@ -139,7 +139,7 @@ static const EnumPropertyItem *dt_layers_select_src_itemf(bContext *C, RNA_enum_item_add_separator(&item, &totitem); - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob_src); + const ListBase *defbase = BKE_object_defgroup_list(ob_src); for (i = 0, dg = defbase->first; dg; i++, dg = dg->next) { tmp_item.value = i; tmp_item.identifier = tmp_item.name = dg->name; diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 24d2e23233e..5065a2c00f0 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -128,7 +128,7 @@ static bool return_editmesh_vgroup(Object *obedit, BMEditMesh *em, char *r_name, } } if (totvert) { - const ListBase *defbase = BKE_object_defgroup_list_for_read(obedit); + const ListBase *defbase = BKE_object_defgroup_list(obedit); bDeformGroup *dg = BLI_findlink(defbase, defgrp_index); BLI_strncpy(r_name, dg->name, sizeof(dg->name)); mul_v3_fl(r_cent, 1.0f / (float)totvert); diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 2dd0bd13088..e05344760f4 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -389,8 +389,8 @@ bool ED_vgroup_array_copy(Object *ob, Object *ob_from) int dvert_tot_from; int dvert_tot; int i; - ListBase *defbase_dst = BKE_object_defgroup_list_for_write(ob); - const ListBase *defbase_src = BKE_object_defgroup_list_for_read(ob_from); + ListBase *defbase_dst = BKE_object_defgroup_list_mutable(ob); + const ListBase *defbase_src = BKE_object_defgroup_list(ob_from); int defbase_tot_from = BLI_listbase_count(defbase_src); int defbase_tot = BLI_listbase_count(defbase_dst); @@ -887,7 +887,7 @@ void ED_vgroup_vert_add(Object *ob, bDeformGroup *dg, int vertnum, float weight, /* add the vert to the deform group with the * specified assign mode */ - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); const int def_nr = BLI_findindex(defbase, dg); MDeformVert *dv = NULL; @@ -919,7 +919,7 @@ void ED_vgroup_vert_remove(Object *ob, bDeformGroup *dg, int vertnum) /* TODO(campbell): This is slow in a loop, better pass def_nr directly, * but leave for later. */ - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); const int def_nr = BLI_findindex(defbase, dg); if (def_nr != -1) { @@ -996,7 +996,7 @@ static float get_vert_def_nr(Object *ob, const int def_nr, const int vertnum) float ED_vgroup_vert_weight(Object *ob, bDeformGroup *dg, int vertnum) { - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); const int def_nr = BLI_findindex(defbase, dg); if (def_nr == -1) { @@ -1024,7 +1024,7 @@ static void vgroup_select_verts(Object *ob, int select) { const int def_nr = BKE_object_defgroup_active_index_get(ob) - 1; - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); if (!BLI_findlink(defbase, def_nr)) { return; } @@ -1120,7 +1120,7 @@ static void vgroup_duplicate(Object *ob) MDeformVert **dvert_array = NULL; int i, idg, icdg, dvert_tot = 0; - ListBase *defbase = BKE_object_defgroup_list_for_write(ob); + ListBase *defbase = BKE_object_defgroup_list_mutable(ob); dg = BLI_findlink(defbase, BKE_object_defgroup_active_index_get(ob) - 1); if (!dg) { @@ -1172,7 +1172,7 @@ static bool vgroup_normalize(Object *ob) const bool use_vert_sel = vertex_group_use_vert_sel(ob); - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); if (!BLI_findlink(defbase, def_nr)) { return false; } @@ -1663,7 +1663,7 @@ static bool vgroup_normalize_all(Object *ob, ED_vgroup_parray_alloc(ob->data, &dvert_array, &dvert_tot, use_vert_sel); if (dvert_array) { - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); const int defbase_tot = BLI_listbase_count(defbase); bool *lock_flags = BKE_object_defgroup_lock_flags_get(ob, defbase_tot); bool changed = false; @@ -1789,7 +1789,7 @@ static void vgroup_lock_all(Object *ob, int action, int mask) if (mask != VGROUP_MASK_ALL) { selected = vgroup_selected_get(ob); } - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); if (action == VGROUP_TOGGLE) { action = VGROUP_LOCK; @@ -2399,7 +2399,7 @@ void ED_vgroup_mirror(Object *ob, *r_totmirr = *r_totfail = 0; - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); if ((mirror_weights == false && flip_vgroups == false) || (BLI_findlink(defbase, def_nr) == NULL)) { @@ -2586,7 +2586,7 @@ cleanup: static void vgroup_delete_active(Object *ob) { - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); bDeformGroup *dg = BLI_findlink(defbase, BKE_object_defgroup_active_index_get(ob) - 1); if (!dg) { return; @@ -2600,7 +2600,7 @@ static void vgroup_assign_verts(Object *ob, const float weight) { const int def_nr = BKE_object_defgroup_active_index_get(ob) - 1; - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); if (!BLI_findlink(defbase, def_nr)) { return; } @@ -2719,7 +2719,7 @@ static bool vertex_group_poll_ex(bContext *C, Object *ob) return false; } - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); if (BLI_listbase_is_empty(defbase)) { CTX_wm_operator_poll_msg_set(C, "Object has no vertex groups"); return false; @@ -2844,7 +2844,7 @@ static bool vertex_group_vert_select_unlocked_poll(bContext *C) } if (BKE_object_defgroup_active_index_get(ob) != 0) { - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); const bDeformGroup *dg = BLI_findlink(defbase, BKE_object_defgroup_active_index_get(ob) - 1); if (dg) { return !(dg->flag & DG_LOCK_WEIGHT); @@ -3046,7 +3046,7 @@ static int vertex_group_remove_from_exec(bContext *C, wmOperator *op) } } else { - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); bDeformGroup *dg = BLI_findlink(defbase, BKE_object_defgroup_active_index_get(ob) - 1); if ((dg == NULL) || (BKE_object_defgroup_clear(ob, dg, !use_all_verts) == false)) { return OPERATOR_CANCELLED; @@ -3971,7 +3971,7 @@ static const EnumPropertyItem *vgroup_itemf(bContext *C, return DummyRNA_NULL_items; } - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); for (a = 0, def = defbase->first; def; def = def->next, a++) { tmp.value = a; tmp.icon = ICON_GROUP_VERTEX; @@ -4021,7 +4021,7 @@ void OBJECT_OT_vertex_group_set_active(wmOperatorType *ot) * with the order of vgroups then call vgroup_do_remap after */ static char *vgroup_init_remap(Object *ob) { - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); int defbase_tot = BLI_listbase_count(defbase); char *name_array = MEM_mallocN(MAX_VGROUP_NAME * sizeof(char) * defbase_tot, "sort vgroups"); char *name; @@ -4039,7 +4039,7 @@ static int vgroup_do_remap(Object *ob, const char *name_array, wmOperator *op) { MDeformVert *dvert = NULL; const bDeformGroup *def; - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); int defbase_tot = BLI_listbase_count(defbase); /* Needs a dummy index at the start. */ @@ -4134,7 +4134,7 @@ static void vgroup_sort_bone_hierarchy(Object *ob, ListBase *bonebase) bonebase = &armature->bonebase; } } - ListBase *defbase = BKE_object_defgroup_list_for_write(ob); + ListBase *defbase = BKE_object_defgroup_list_mutable(ob); if (bonebase != NULL) { Bone *bone; @@ -4165,7 +4165,7 @@ static int vertex_group_sort_exec(bContext *C, wmOperator *op) /* Init remapping. */ name_array = vgroup_init_remap(ob); - ListBase *defbase = BKE_object_defgroup_list_for_write(ob); + ListBase *defbase = BKE_object_defgroup_list_mutable(ob); /* Sort vgroup names. */ switch (sort_type) { @@ -4228,7 +4228,7 @@ static int vgroup_move_exec(bContext *C, wmOperator *op) int dir = RNA_enum_get(op->ptr, "direction"); int ret = OPERATOR_FINISHED; - ListBase *defbase = BKE_object_defgroup_list_for_write(ob); + ListBase *defbase = BKE_object_defgroup_list_mutable(ob); def = BLI_findlink(defbase, BKE_object_defgroup_active_index_get(ob) - 1); if (!def) { @@ -4356,7 +4356,7 @@ static void vgroup_copy_active_to_sel_single(Object *ob, const int def_nr) static bool check_vertex_group_accessible(wmOperator *op, Object *ob, int def_nr) { - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); bDeformGroup *dg = BLI_findlink(defbase, def_nr); if (!dg) { diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c index 6ebda0dfedb..19ffa0c952d 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c @@ -79,7 +79,7 @@ bool ED_wpaint_ensure_data(bContext *C, WM_event_add_notifier(C, NC_GEOM | ND_DATA, me); } - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); /* this happens on a Bone select, when no vgroup existed yet */ if (me->vertex_group_active_index <= 0) { @@ -136,7 +136,7 @@ bool ED_wpaint_ensure_data(bContext *C, /* mirror_vgroup is set to -1 when invalid */ int ED_wpaint_mirror_vgroup_ensure(Object *ob, const int vgroup_active) { - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); bDeformGroup *defgroup = BLI_findlink(defbase, vgroup_active); if (defgroup) { diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 00f825a5142..c08707b7a6a 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1,4 +1,4 @@ -/* +/* * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -554,7 +554,7 @@ static void outliner_add_object_contents(SpaceOutliner *space_outliner, /* vertex groups */ if (ELEM(ob->type, OB_MESH, OB_GPENCIL, OB_LATTICE)) { - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); if (!BLI_listbase_is_empty(defbase)) { TreeElement *tenla = outliner_add_element( space_outliner, &te->subtree, ob, te, TSE_DEFGROUP_BASE, 0); diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index d0f32f4305a..d5e52785937 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -1211,7 +1211,7 @@ static void view3d_panel_vgroup(const bContext *C, Panel *panel) vgroup_validmap = BKE_object_defgroup_subset_from_select_type( ob, subset_type, &vgroup_tot, &subset_count); - const ListBase *defbase = BKE_object_defgroup_list_for_read(ob); + const ListBase *defbase = BKE_object_defgroup_list(ob); for (i = 0, dg = defbase->first; dg; i++, dg = dg->next) { bool locked = (dg->flag & DG_LOCK_WEIGHT) != 0; |