[Bf-blender-cvs] [bba4a09b2f0] master: Cleanup: use 'BKE_' prefix for BKE_deform API calls

Campbell Barton noreply at git.blender.org
Fri Mar 6 02:58:35 CET 2020


Commit: bba4a09b2f0b73f0a38e1eccc403a4cef536f703
Author: Campbell Barton
Date:   Fri Mar 6 12:50:56 2020 +1100
Branches: master
https://developer.blender.org/rBbba4a09b2f0b73f0a38e1eccc403a4cef536f703

Cleanup: use 'BKE_' prefix for BKE_deform API calls

- Use 'BKE_object_defgroup' prefix for object functions.

- Rename 'defvert_verify_index' to 'defvert_ensure_index'
  since this adds the group if it isn't found.

===================================================================

M	source/blender/blenkernel/BKE_deform.h
M	source/blender/blenkernel/intern/armature.c
M	source/blender/blenkernel/intern/constraint.c
M	source/blender/blenkernel/intern/data_transfer.c
M	source/blender/blenkernel/intern/deform.c
M	source/blender/blenkernel/intern/dynamicpaint.c
M	source/blender/blenkernel/intern/fluid.c
M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/blenkernel/intern/key.c
M	source/blender/blenkernel/intern/lattice.c
M	source/blender/blenkernel/intern/mesh_mirror.c
M	source/blender/blenkernel/intern/mesh_validate.c
M	source/blender/blenkernel/intern/object.c
M	source/blender/blenkernel/intern/object_deform.c
M	source/blender/blenkernel/intern/particle.c
M	source/blender/blenkernel/intern/shrinkwrap.c
M	source/blender/blenkernel/intern/softbody.c
M	source/blender/blenloader/intern/versioning_legacy.c
M	source/blender/bmesh/tools/bmesh_bevel.c
M	source/blender/bmesh/tools/bmesh_wireframe.c
M	source/blender/collada/ArmatureImporter.cpp
M	source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M	source/blender/draw/intern/draw_cache_extract_mesh.c
M	source/blender/draw/intern/draw_cache_impl_lattice.c
M	source/blender/editors/armature/armature_naming.c
M	source/blender/editors/armature/armature_skinning.c
M	source/blender/editors/gpencil/gpencil_armature.c
M	source/blender/editors/gpencil/gpencil_brush.c
M	source/blender/editors/gpencil/gpencil_data.c
M	source/blender/editors/gpencil/gpencil_fill.c
M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/editors/gpencil/gpencil_primitive.c
M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/editors/mesh/editmesh_tools.c
M	source/blender/editors/mesh/meshtools.c
M	source/blender/editors/object/object_hook.c
M	source/blender/editors/object/object_vgroup.c
M	source/blender/editors/physics/dynamicpaint_ops.c
M	source/blender/editors/sculpt_paint/paint_vertex.c
M	source/blender/editors/sculpt_paint/paint_vertex_color_ops.c
M	source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
M	source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c
M	source/blender/editors/space_outliner/outliner_draw.c
M	source/blender/editors/space_view3d/view3d_buttons.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M	source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
M	source/blender/makesrna/intern/rna_object.c
M	source/blender/makesrna/intern/rna_particle.c
M	source/blender/modifiers/intern/MOD_bevel.c
M	source/blender/modifiers/intern/MOD_cast.c
M	source/blender/modifiers/intern/MOD_correctivesmooth.c
M	source/blender/modifiers/intern/MOD_decimate.c
M	source/blender/modifiers/intern/MOD_displace.c
M	source/blender/modifiers/intern/MOD_explode.c
M	source/blender/modifiers/intern/MOD_hook.c
M	source/blender/modifiers/intern/MOD_laplaciandeform.c
M	source/blender/modifiers/intern/MOD_laplaciansmooth.c
M	source/blender/modifiers/intern/MOD_mask.cc
M	source/blender/modifiers/intern/MOD_meshdeform.c
M	source/blender/modifiers/intern/MOD_simpledeform.c
M	source/blender/modifiers/intern/MOD_skin.c
M	source/blender/modifiers/intern/MOD_smooth.c
M	source/blender/modifiers/intern/MOD_solidify_extrude.c
M	source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
M	source/blender/modifiers/intern/MOD_util.c
M	source/blender/modifiers/intern/MOD_uvwarp.c
M	source/blender/modifiers/intern/MOD_warp.c
M	source/blender/modifiers/intern/MOD_wave.c
M	source/blender/modifiers/intern/MOD_weighted_normal.c
M	source/blender/modifiers/intern/MOD_weightvg_util.c
M	source/blender/modifiers/intern/MOD_weightvgedit.c
M	source/blender/modifiers/intern/MOD_weightvgmix.c
M	source/blender/modifiers/intern/MOD_weightvgproximity.c
M	source/blender/modifiers/intern/MOD_weld.c
M	source/blender/modifiers/intern/MOD_wireframe.c
M	source/blender/python/bmesh/bmesh_py_types_meshdata.c
M	source/blender/render/intern/source/pointdensity.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h
index 2911002b9e9..222678407d1 100644
--- a/source/blender/blenkernel/BKE_deform.h
+++ b/source/blender/blenkernel/BKE_deform.h
@@ -37,35 +37,35 @@ struct MPoly;
 struct Object;
 struct bDeformGroup;
 
-struct bDeformGroup *BKE_defgroup_new(struct Object *ob, const char *name);
-void defgroup_copy_list(struct ListBase *lb1, const struct ListBase *lb2);
-struct bDeformGroup *defgroup_duplicate(const struct bDeformGroup *ingroup);
-struct bDeformGroup *defgroup_find_name(struct Object *ob, const char *name);
-int *defgroup_flip_map(struct Object *ob, int *flip_map_len, const bool use_default);
-int *defgroup_flip_map_single(struct Object *ob,
-                              int *flip_map_len,
-                              const bool use_default,
-                              int defgroup);
-int defgroup_flip_index(struct Object *ob, int index, const bool use_default);
-int defgroup_name_index(struct Object *ob, const char *name);
-void defgroup_unique_name(struct bDeformGroup *dg, struct Object *ob);
+struct bDeformGroup *BKE_object_defgroup_new(struct Object *ob, const char *name);
+void BKE_defgroup_copy_list(struct ListBase *lb1, const struct ListBase *lb2);
+struct bDeformGroup *BKE_defgroup_duplicate(const struct bDeformGroup *ingroup);
+struct bDeformGroup *BKE_object_defgroup_find_name(struct Object *ob, const char *name);
+int *BKE_object_defgroup_flip_map(struct Object *ob, int *flip_map_len, const bool use_default);
+int *BKE_object_defgroup_flip_map_single(struct Object *ob,
+                                         int *flip_map_len,
+                                         const bool use_default,
+                                         int defgroup);
+int BKE_object_defgroup_flip_index(struct Object *ob, int index, const bool use_default);
+int BKE_object_defgroup_name_index(struct Object *ob, const char *name);
+void BKE_object_defgroup_unique_name(struct bDeformGroup *dg, struct Object *ob);
 
-struct MDeformWeight *defvert_find_index(const struct MDeformVert *dv, const int defgroup);
-struct MDeformWeight *defvert_verify_index(struct MDeformVert *dv, const int defgroup);
-void defvert_add_index_notest(struct MDeformVert *dv, int defgroup, const float weight);
-void defvert_remove_group(struct MDeformVert *dvert, struct MDeformWeight *dw);
-void defvert_clear(struct MDeformVert *dvert);
-int defvert_find_shared(const struct MDeformVert *dvert_a, const struct MDeformVert *dvert_b);
-bool defvert_is_weight_zero(const struct MDeformVert *dvert, const int defgroup_tot);
+struct MDeformWeight *BKE_defvert_find_index(const struct MDeformVert *dv, const int defgroup);
+struct MDeformWeight *BKE_defvert_ensure_index(struct MDeformVert *dv, const int defgroup);
+void BKE_defvert_add_index_notest(struct MDeformVert *dv, int defgroup, const float weight);
+void BKE_defvert_remove_group(struct MDeformVert *dvert, struct MDeformWeight *dw);
+void BKE_defvert_clear(struct MDeformVert *dvert);
+int BKE_defvert_find_shared(const struct MDeformVert *dvert_a, const struct MDeformVert *dvert_b);
+bool BKE_defvert_is_weight_zero(const struct MDeformVert *dvert, const int defgroup_tot);
 
 void BKE_defvert_array_free_elems(struct MDeformVert *dvert, int totvert);
 void BKE_defvert_array_free(struct MDeformVert *dvert, int totvert);
 void BKE_defvert_array_copy(struct MDeformVert *dst, const struct MDeformVert *src, int totvert);
 
-float defvert_find_weight(const struct MDeformVert *dvert, const int defgroup);
-float defvert_array_find_weight_safe(const struct MDeformVert *dvert,
-                                     const int index,
-                                     const int defgroup);
+float BKE_defvert_find_weight(const struct MDeformVert *dvert, const int defgroup);
+float BKE_defvert_array_find_weight_safe(const struct MDeformVert *dvert,
+                                         const int index,
+                                         const int defgroup);
 
 float BKE_defvert_multipaint_collective_weight(const struct MDeformVert *dv,
                                                int defbase_tot,
@@ -73,45 +73,47 @@ float BKE_defvert_multipaint_collective_weight(const struct MDeformVert *dv,
                                                int defbase_tot_sel,
                                                bool do_autonormalize);
 
-void defvert_copy(struct MDeformVert *dvert_dst, const struct MDeformVert *dvert_src);
-void defvert_copy_subset(struct MDeformVert *dvert_dst,
-                         const struct MDeformVert *dvert_src,
-                         const bool *vgroup_subset,
-                         const int vgroup_tot);
-void defvert_mirror_subset(struct MDeformVert *dvert_dst,
-                           const struct MDeformVert *dvert_src,
-                           const bool *vgroup_subset,
-                           const int vgroup_tot,
-                           const int *flip_map,
-                           const int flip_map_len);
-void defvert_copy_index(struct MDeformVert *dvert_dst,
-                        const int defgroup_dst,
-                        const struct MDeformVert *dvert_src,
-                        const int defgroup_src);
-void defvert_sync(struct MDeformVert *dvert_dst,
-                  const struct MDeformVert *dvert_src,
-                  const bool use_verify);
-void defvert_sync_mapped(struct MDeformVert *dvert_dst,
-                         const struct MDeformVert *dvert_src,
-                         const int *flip_map,
-                         const int flip_map_len,
-                         const bool use_verify);
-void defvert_remap(struct MDeformVert *dvert, int *map, const int map_len);
-void defvert_flip(struct MDeformVert *dvert, const int *flip_map, const int flip_map_len);
-void defvert_flip_merged(struct MDeformVert *dvert, const int *flip_map, const int flip_map_len);
-void defvert_normalize(struct MDeformVert *dvert);
-void defvert_normalize_subset(struct MDeformVert *dvert,
-                              const bool *vgroup_subset,
-                              const int vgroup_tot);
-void defvert_normalize_lock_single(struct MDeformVert *dvert,
-                                   const bool *vgroup_subset,
-                                   const int vgroup_tot,
-                                   const uint def_nr_lock);
-void defvert_normalize_lock_map(struct MDeformVert *dvert,
-                                const bool *vgroup_subset,
-                                const int vgroup_tot,
-                                const bool *lock_flags,
-                                const int defbase_tot);
+void BKE_defvert_copy(struct MDeformVert *dvert_dst, const struct MDeformVert *dvert_src);
+void BKE_defvert_copy_subset(struct MDeformVert *dvert_dst,
+                             const struct MDeformVert *dvert_src,
+                             const bool *vgroup_subset,
+                             const int vgroup_tot);
+void BKE_defvert_mirror_subset(struct MDeformVert *dvert_dst,
+                               const struct MDeformVert *dvert_src,
+                               const bool *vgroup_subset,
+                               const int vgroup_tot,
+                               const int *flip_map,
+                               const int flip_map_len);
+void BKE_defvert_copy_index(struct MDeformVert *dvert_dst,
+                            const int defgroup_dst,
+                            const struct MDeformVert *dvert_src,
+                            const int defgroup_src);
+void BKE_defvert_sync(struct MDeformVert *dvert_dst,
+                      const struct MDeformVert *dvert_src,
+                      const bool use_verify);
+void BKE_defvert_sync_mapped(struct MDeformVert *dvert_dst,
+                             const struct MDeformVert *dvert_src,
+                             const int *flip_map,
+                             const int flip_map_len,
+                             const bool use_verify);
+void BKE_defvert_remap(struct MDeformVert *dvert, int *map, const int map_len);
+void BKE_defvert_flip(struct MDeformVert *dvert, const int *flip_map, const int flip_map_len);
+void BKE_defvert_flip_merged(struct MDeformVert *dvert,
+                             const int *flip_map,
+                             const int flip_map_len);
+void BKE_defvert_normalize(struct MDeformVert *dvert);
+void BKE_defvert_normalize_subset(struct MDeformVert *dvert,
+                                  const bool *vgroup_subset,
+                                  const int vgroup_tot);
+void BKE_defvert_normalize_lock_single(struct MDeformVert *dvert,
+                                       const bool *vgroup_subset,
+                                       const int vgroup_tot,
+                                       const uint def_nr_lock);
+void BKE_defvert_normalize_lock_map(struct MDeformVert *dvert,
+                                    const bool *vgroup_subset,
+                                    const int vgroup_tot,
+                                    const bool *lock_flags,
+                                    const int defbase_tot);
 
 /* Utilities to 'extract' a given vgroup into a simple float array,
  * for verts, but also edges/polys/loops. */
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 3216837ae16..f48f29406e3 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1533,7 +1533,7 @@ static void armature_vert_task(void *__restrict userdata,
   }
 
   if (armature_def_nr != -1 && dvert) {
-    armature_weight = defvert_find_weight(dvert, armature_def_nr);
+    armature_weight = BKE_defvert_find_weight(dvert, armature_def_nr);
 
     if (data->invert_vgroup) {
       armature_weight = 1.0f - armature_weight;
@@ -1681,7 +1681,7 @@ void armature_deform_verts(Object *armOb,
   }
 
   /* get the def_nr for the overall armature vertex group if present */
-  armature_def_nr = defgroup_name_index(target, defgrp_name);
+  armature_def_nr = BKE_object_defgroup_name_index(target, defgrp_name);
 
   if (ELEM(target->t

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list