diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-15 19:52:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-15 19:52:48 +0400 |
commit | 65dcc6ad4f11097eeb601fcd70b3db52ed482f6f (patch) | |
tree | 672b5f02870b1141821d083359154c3c8e72887a /source/blender/blenkernel | |
parent | e1229b2978c37a043f3932657ac5cfa156093866 (diff) |
use bool arrays rather then char for weight paint lock/select arrays
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_deform.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_object_deform.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/deform.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object_deform.c | 14 |
5 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h index b18bb5a87b6..5e8cd8d90fa 100644 --- a/source/blender/blenkernel/BKE_deform.h +++ b/source/blender/blenkernel/BKE_deform.h @@ -74,7 +74,7 @@ void defvert_flip(struct MDeformVert *dvert, const int *flip_map, const int flip 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_lock_single(struct MDeformVert *dvert, const int def_nr_lock); -void defvert_normalize_lock_map(struct MDeformVert *dvert, const char *lock_flags, const int defbase_tot); +void defvert_normalize_lock_map(struct MDeformVert *dvert, const bool *lock_flags, const int defbase_tot); /* utility function, note that MAX_VGROUP_NAME chars is the maximum string length since its only * used with defgroups currently */ diff --git a/source/blender/blenkernel/BKE_object_deform.h b/source/blender/blenkernel/BKE_object_deform.h index ecc521a77fb..6de7ff9bc1c 100644 --- a/source/blender/blenkernel/BKE_object_deform.h +++ b/source/blender/blenkernel/BKE_object_deform.h @@ -31,8 +31,8 @@ struct Object; -char *BKE_objdef_lock_flags_get(struct Object *ob, const int defbase_tot); -char *BKE_objdef_validmap_get(struct Object *ob, const int defbase_tot); -char *BKE_objdef_selected_get(struct Object *ob, int defbase_tot, int *r_dg_flags_sel_tot); +bool *BKE_objdef_lock_flags_get(struct Object *ob, const int defbase_tot); +bool *BKE_objdef_validmap_get(struct Object *ob, const int defbase_tot); +bool *BKE_objdef_selected_get(struct Object *ob, int defbase_tot, int *r_dg_flags_sel_tot); #endif /* __BKE_OBJECT_DEFORM_H__ */ diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 6e332559e29..3dda6933eab 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1066,7 +1066,7 @@ static void calc_weightpaint_vert_color( MDeformVert *dv, DMWeightColorInfo *dm_wcinfo, const int defbase_tot, const int defbase_act, - const char *defbase_sel, const int defbase_sel_tot, + const bool *defbase_sel, const int defbase_sel_tot, const int draw_flag) { float input = 0.0f; @@ -1154,7 +1154,7 @@ static void calc_weightpaint_vert_array(Object *ob, DerivedMesh *dm, int const d const int defbase_act = ob->actdef - 1; int defbase_sel_tot = 0; - char *defbase_sel = NULL; + bool *defbase_sel = NULL; if (draw_flag & CALC_WP_MULTIPAINT) { defbase_sel = BKE_objdef_selected_get(ob, defbase_tot, &defbase_sel_tot); diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index ed665d44431..371f64fd468 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -254,7 +254,7 @@ void defvert_normalize_lock_single(MDeformVert *dvert, const int def_nr_lock) } } -void defvert_normalize_lock_map(MDeformVert *dvert, const char *lock_flags, const int defbase_tot) +void defvert_normalize_lock_map(MDeformVert *dvert, const bool *lock_flags, const int defbase_tot) { if (dvert->totweight <= 0) { /* nothing */ diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c index 7f9578250f2..03e331436f9 100644 --- a/source/blender/blenkernel/intern/object_deform.c +++ b/source/blender/blenkernel/intern/object_deform.c @@ -45,12 +45,12 @@ * gets the status of "flag" for each bDeformGroup * in ob->defbase and returns an array containing them */ -char *BKE_objdef_lock_flags_get(Object *ob, const int defbase_tot) +bool *BKE_objdef_lock_flags_get(Object *ob, const int defbase_tot) { - char is_locked = FALSE; + bool is_locked = false; int i; //int defbase_tot = BLI_countlist(&ob->defbase); - char *lock_flags = MEM_mallocN(defbase_tot * sizeof(char), "defflags"); + bool *lock_flags = MEM_mallocN(defbase_tot * sizeof(bool), "defflags"); bDeformGroup *defgroup; for (i = 0, defgroup = ob->defbase.first; i < defbase_tot && defgroup; defgroup = defgroup->next, i++) { @@ -65,11 +65,11 @@ char *BKE_objdef_lock_flags_get(Object *ob, const int defbase_tot) return NULL; } -char *BKE_objdef_validmap_get(Object *ob, const int defbase_tot) +bool *BKE_objdef_validmap_get(Object *ob, const int defbase_tot) { bDeformGroup *dg; ModifierData *md; - char *vgroup_validmap; + bool *vgroup_validmap; GHash *gh; int i, step1 = 1; //int defbase_tot = BLI_countlist(&ob->defbase); @@ -127,9 +127,9 @@ char *BKE_objdef_validmap_get(Object *ob, const int defbase_tot) /* Returns total selected vgroups, * wpi.defbase_sel is assumed malloc'd, all values are set */ -char *BKE_objdef_selected_get(Object *ob, int defbase_tot, int *r_dg_flags_sel_tot) +bool *BKE_objdef_selected_get(Object *ob, int defbase_tot, int *r_dg_flags_sel_tot) { - char *dg_selection = MEM_mallocN(defbase_tot * sizeof(char), __func__); + bool *dg_selection = MEM_mallocN(defbase_tot * sizeof(bool), __func__); bDeformGroup *defgroup; unsigned int i; Object *armob = BKE_object_pose_armature_get(ob); |