[Bf-blender-cvs] [941c4188ad3] refactor-vertex-group-names: Rename functions "for_read" -> "" and "for_write" -> "mutable"
Hans Goudey
noreply at git.blender.org
Tue Jul 13 01:41:12 CEST 2021
Commit: 941c4188ad3d8a87e35d380ecf7ccd14a9f25d9d
Author: Hans Goudey
Date: Mon Jul 5 10:27:27 2021 -0500
Branches: refactor-vertex-group-names
https://developer.blender.org/rB941c4188ad3d8a87e35d380ecf7ccd14a9f25d9d
Rename functions "for_read" -> "" and "for_write" -> "mutable"
===================================================================
M source/blender/blenkernel/BKE_deform.h
M source/blender/blenkernel/intern/armature_deform.c
M source/blender/blenkernel/intern/deform.c
M source/blender/blenkernel/intern/object_deform.c
M source/blender/blenloader/intern/versioning_300.c
M source/blender/draw/engines/overlay/overlay_armature.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_primitive.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/mesh/editmesh_select_similar.c
M source/blender/editors/object/object_data_transfer.c
M source/blender/editors/object/object_hook.c
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_view3d/view3d_buttons.c
M source/blender/io/collada/ControllerExporter.cpp
M source/blender/io/collada/SkinInfo.cpp
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/modifiers/intern/MOD_armature.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h
index 81136822ca9..1330bee87df 100644
--- a/source/blender/blenkernel/BKE_deform.h
+++ b/source/blender/blenkernel/BKE_deform.h
@@ -39,8 +39,8 @@ struct Object;
struct bDeformGroup;
struct ID;
-const struct ListBase *BKE_object_defgroup_list_for_read(const struct Object *ob);
-struct ListBase *BKE_object_defgroup_list_for_write(struct Object *ob);
+const struct ListBase *BKE_object_defgroup_list(const struct Object *ob);
+struct ListBase *BKE_object_defgroup_list_mutable(struct Object *ob);
int BKE_object_defgroup_count(const struct Object *ob);
int BKE_object_defgroup_active_index_get(const struct Object *ob);
diff --git a/source/blender/blenkernel/intern/armature_deform.c b/source/blender/blenkernel/intern/armature_deform.c
index b86103c4a3a..2552b5eefea 100644
--- a/source/blender/blenkernel/intern/armature_deform.c
+++ b/source/blender/blenkernel/intern/armature_deform.c
@@ -551,7 +551,7 @@ static void armature_deform_coords_impl(const Object *ob_arm,
*
* - Check whether keeping this consistent across frames gives speedup.
*/
- const ListBase *defbase = BKE_object_defgroup_list_for_read(ob_target);
+ const ListBase *defbase = BKE_object_defgroup_list(ob_target);
for (i = 0, dg = defbase->first; dg; i++, dg = dg->next) {
pchan_from_defbase[i] = BKE_pose_channel_find_name(ob_arm->pose, dg->name);
/* exclude non-deforming bones */
diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index 362fdd70bde..4a2c084bde5 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -66,7 +66,7 @@ bDeformGroup *BKE_object_defgroup_new(Object *ob, const char *name)
BLI_strncpy(defgroup->name, name, sizeof(defgroup->name));
- ListBase *defbase = BKE_object_defgroup_list_for_write(ob);
+ ListBase *defbase = BKE_object_defgroup_list_mutable(ob);
BLI_addtail(defbase, defgroup);
BKE_object_defgroup_unique_name(defgroup, ob);
@@ -493,7 +493,7 @@ bDeformGroup *BKE_object_defgroup_find_name(const Object *ob, const char *name)
if (name == NULL || name[0] == '\0') {
return NULL;
}
- const ListBase *defbase = BKE_object_defgroup_list_for_read(ob);
+ const ListBase *defbase = BKE_object_defgroup_list(ob);
return BLI_findstring(defbase, name, offsetof(bDeformGroup, name));
}
@@ -502,7 +502,7 @@ int BKE_object_defgroup_name_index(const Object *ob, const char *name)
if (name == NULL || name[0] == '\0') {
return -1;
}
- const ListBase *defbase = BKE_object_defgroup_list_for_read(ob);
+ const ListBase *defbase = BKE_object_defgroup_list(ob);
return BLI_findstringindex(defbase, name, offsetof(bDeformGroup, name));
}
@@ -540,19 +540,19 @@ ListBase *BKE_id_defgroup_list_get_mutable(ID *id)
return (ListBase *)BKE_id_defgroup_list_get(id);
}
-const ListBase *BKE_object_defgroup_list_for_read(const Object *ob)
+const ListBase *BKE_object_defgroup_list(const Object *ob)
{
return BKE_id_defgroup_list_get((const ID *)ob->data);
}
-ListBase *BKE_object_defgroup_list_for_write(Object *ob)
+ListBase *BKE_object_defgroup_list_mutable(Object *ob)
{
return BKE_id_defgroup_list_get_mutable((ID *)ob->data);
}
int BKE_object_defgroup_count(const Object *ob)
{
- return BLI_listbase_count(BKE_object_defgroup_list_for_read(ob));
+ return BLI_listbase_count(BKE_object_defgroup_list(ob));
}
/**
@@ -610,7 +610,7 @@ void BKE_object_defgroup_active_index_set(Object *ob, const int new_index)
*/
int *BKE_object_defgroup_flip_map(const Object *ob, int *flip_map_len, const bool use_default)
{
- const ListBase *defbase = BKE_object_defgroup_list_for_read(ob);
+ const ListBase *defbase = BKE_object_defgroup_list(ob);
int defbase_tot = *flip_map_len = BLI_listbase_count(defbase);
if (defbase_tot == 0) {
@@ -655,7 +655,7 @@ int *BKE_object_defgroup_flip_map_single(const Object *ob,
const bool use_default,
int defgroup)
{
- const ListBase *defbase = BKE_object_defgroup_list_for_read(ob);
+ const ListBase *defbase = BKE_object_defgroup_list(ob);
int defbase_tot = *flip_map_len = BLI_listbase_count(defbase);
if (defbase_tot == 0) {
@@ -687,7 +687,7 @@ int *BKE_object_defgroup_flip_map_single(const Object *ob,
int BKE_object_defgroup_flip_index(const Object *ob, int index, const bool use_default)
{
- const ListBase *defbase = BKE_object_defgroup_list_for_read(ob);
+ const ListBase *defbase = BKE_object_defgroup_list(ob);
bDeformGroup *dg = BLI_findlink(defbase, index);
int flip_index = -1;
@@ -705,7 +705,7 @@ int BKE_object_defgroup_flip_index(const Object *ob, int index, const bool use_d
static bool defgroup_find_name_dupe(const char *name, bDeformGroup *dg, Object *ob)
{
- const ListBase *defbase = BKE_object_defgroup_list_for_read(ob);
+ const ListBase *defbase = BKE_object_defgroup_list(ob);
bDeformGroup *curdef;
for (curdef = defbase->first; curdef; curdef = curdef->next) {
@@ -1300,8 +1300,8 @@ static bool data_transfer_layersmapping_vgroups_multisrc_to_dst(ListBase *r_map,
{
int idx_src;
int idx_dst;
- const ListBase *src_list = BKE_object_defgroup_list_for_read(ob_src);
- ListBase *dst_defbase = BKE_object_defgroup_list_for_write(ob_dst);
+ const ListBase *src_list = BKE_object_defgroup_list(ob_src);
+ ListBase *dst_defbase = BKE_object_defgroup_list_mutable(ob_dst);
int tot_dst = BLI_listbase_count(dst_defbase);
@@ -1458,7 +1458,7 @@ bool data_transfer_layersmapping_vgroups(ListBase *r_map,
* Note: Above comment is outdated, but this function was written when that was true.
*/
- const ListBase *src_defbase = BKE_object_defgroup_list_for_read(ob_src);
+ const ListBase *src_defbase = BKE_object_defgroup_list(ob_src);
if (BLI_listbase_is_empty(src_defbase)) {
if (use_delete) {
BKE_object_defgroup_remove_all(ob_dst);
@@ -1493,7 +1493,7 @@ bool data_transfer_layersmapping_vgroups(ListBase *r_map,
if (tolayers >= 0) {
/* NOTE: in this case we assume layer exists! */
idx_dst = tolayers;
- const ListBase *dst_defbase = BKE_object_defgroup_list_for_read(ob_dst);
+ const ListBase *dst_defbase = BKE_object_defgroup_list(ob_dst);
BLI_assert(idx_dst < BLI_listbase_count(dst_defbase));
UNUSED_VARS_NDEBUG(dst_defbase);
}
diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c
index 9bc1508ac8e..c69326a23c6 100644
--- a/source/blender/blenkernel/intern/object_deform.c
+++ b/source/blender/blenkernel/intern/object_deform.c
@@ -171,7 +171,7 @@ MDeformVert *BKE_object_defgroup_data_create(ID *id)
bool BKE_object_defgroup_clear(Object *ob, bDeformGroup *dg, const bool use_selection)
{
MDeformVert *dv;
- 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);
bool changed = false;
@@ -250,7 +250,7 @@ bool BKE_object_defgroup_clear_all(Object *ob, const bool use_selection)
bDeformGroup *dg;
bool changed = false;
- const ListBase *defbase = BKE_object_defgroup_list_for_read(ob);
+ const ListBase *defbase = BKE_object_defgroup_list(ob);
for (dg = defbase->first; dg; dg = dg->next) {
if (BKE_object_defgroup_clear(ob, dg, use_selection)) {
@@ -288,7 +288,7 @@ static void object_defgroup_remove_common(Object *ob, bDeformGroup *dg, const in
object_defgroup_remove_update_users(ob, def_nr + 1);
/* Remove the group */
- ListBase *defbase = BKE_object_defgroup_list_for_write(ob);
+ ListBase *defbase = BKE_object_defgroup_list_mutable(ob);
BLI_freelinkN(defbase, dg);
@@ -323,7 +323,7 @@ static void object_defgroup_remove_object_mode(Object *ob, bDeformGroup *dg)
{
MDeformVert *dvert_array = NULL;
int dvert_tot = 0;
- 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);
@@ -356,7 +356,7 @@ static void object_defgroup_remove_object_mode(Object *ob, bDeformGroup *dg)
static void object_defgroup_remove_edit_mode(Object *ob, bDeformGroup *dg)
{
int i;
- 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);
BLI_assert(def_nr != -1);
@@ -435,7 +435,7 @@ void BKE_object_defgroup_remove(Object *ob, bDeformGroup *defgroup)
*/
void BKE_object_defgroup_remove_all_ex(struct Object *ob, bool only_unlocked)
{
- ListBase *defbase = BKE_object_defgroup_list_for_write(ob);
+ ListBase *defbase = BKE_object_defgroup_list_mutable(ob);
bDeformGroup *dg = (bDeformGroup *)defbase->first;
const bool edit_mode = BKE_object_is_in_editmode_vgroup(ob);
@@ -490,8 +490,8 @@ void BKE_object_defgroup_remove_all(struct Object *ob)
*/
int *BKE_object_defgroup_index_map_create(Object *ob_src, Object *ob_dst, int *r_map_len)
{
- const ListBase *src_defbase = BKE_object_defgroup_list_for_read(ob_src);
- const ListBase *dst_defbase = BKE_object_defgroup_list_for_read(ob_dst);
+ const ListBase *src_defbase = BKE_object_defgroup_list(ob_src);
+ const ListBase *dst_defbase = BKE_object_defgroup_list(ob_dst);
/* Build src to merged mapping of vgroup indices. */
if (BLI_listbase_is_empty(src_defbase) || BLI_listbase_is_empty(dst_defbase)) {
@@ -597,7 +597,7 @@ bool *BKE_object_defgroup_lock_flags_get(Object *ob, const int defbase_tot)
{
bool is_locked = false;
int i;
- ListBase *defbase = BKE_object_defgroup_list_for_write(ob);
+ ListBase *defbase = BKE_object_defgroup_list_mutable(ob);
bool *lock_flags = MEM_mallocN(defbase_tot * sizeof(bool), "defflags");
bDeformGroup *defgroup;
@@ -621,7 +621,7 @@ bool *BKE_object_defgroup_validmap_get(Object *ob, const int defbase_tot)
bool *defgroup_validmap;
GHash *gh;
int i, step1 = 1;
- const ListBase *defbase = BKE_object_defgroup
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list