From 70fd2320c8d2d9682ef8dea586e260193596d0e3 Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Sun, 23 Jun 2013 15:37:08 +0000 Subject: Added polished Vertex Weights Panel (properties sidebar) --- source/blender/editors/include/ED_mesh.h | 1 + source/blender/editors/include/ED_object.h | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'source/blender/editors/include') diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 0b25c494ba9..1ee3ae1283d 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -250,6 +250,7 @@ bool ED_vgroup_object_is_edit_mode(struct Object *ob); void ED_vgroup_vert_add(struct Object *ob, struct bDeformGroup *dg, int vertnum, float weight, int assignmode); void ED_vgroup_vert_remove(struct Object *ob, struct bDeformGroup *dg, int vertnum); float ED_vgroup_vert_weight(struct Object *ob, struct bDeformGroup *dg, int vertnum); +void ED_vgroup_vert_active_mirror(struct Object *ob, int def_nr); /* mesh_data.c */ diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index b2810031474..e891f648713 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -65,6 +65,11 @@ struct wmKeyConfig; struct wmKeyMap; struct wmOperator; struct wmOperatorType; +struct PointerRNA; +struct PropertyRNA; +struct EnumPropertyItem; + +enum eVGroupSelect; /* object_edit.c */ struct Object *ED_object_context(struct bContext *C); /* context.object */ @@ -200,21 +205,16 @@ int ED_object_multires_update_totlevels_cb(struct Object *ob, void *totlevel_v); /* object_select.c */ void ED_object_select_linked_by_id(struct bContext *C, struct ID *id); -/* object_vgroup.c */ -typedef enum eVGroupSelect { - WT_VGROUP_ACTIVE = 1, - WT_VGROUP_BONE_SELECT = 2, - WT_VGROUP_BONE_DEFORM = 3, - WT_VGROUP_ALL = 4, -} eVGroupSelect; - -#define WT_VGROUP_MASK_ALL \ - ((1 << WT_VGROUP_ACTIVE) | \ - (1 << WT_VGROUP_BONE_SELECT) | \ - (1 << WT_VGROUP_BONE_DEFORM) | \ - (1 << WT_VGROUP_ALL)) - -bool *ED_vgroup_subset_from_select_type(struct Object *ob, eVGroupSelect subset_type, int *r_vgroup_tot, int *r_subset_count); + +bool *ED_vgroup_subset_from_select_type(struct Object *ob, enum eVGroupSelect subset_type, + int *r_vgroup_tot, int *r_subset_count); + +struct EnumPropertyItem *ED_object_vgroup_selection_itemf_helper( + const struct bContext *C, + struct PointerRNA *ptr, + struct PropertyRNA *prop, + int *free, + const unsigned int selection_mask); #ifdef __cplusplus } -- cgit v1.2.3