Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Automatic commit by arc

Browse Source
This commit is contained in:
gaiaclary
2014-07-16 13:50:47 +02:00
parent 7eb539c04b
commit 10da6ddbee
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/properties_data_mesh.py
View File

@@ -29,8 +29,8 @@ class MESH_MT_vertex_group_specials(Menu):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
layout.operator("object.vertex_group_sort", icon='SORTALPHA').sort_type="ALPHANUMERIC" layout.operator("object.vertex_group_sort", icon='SORTALPHA').sort_type = "NAME"
layout.operator("object.vertex_group_sort", icon='ARMATURE_DATA', text="Sort by Bone Hierarchy").sort_type="BONE_HIERARCHY" layout.operator("object.vertex_group_sort", icon='ARMATURE_DATA', text="Sort by Bone Hierarchy").sort_type = "BONE_HIERARCHY"
layout.operator("object.vertex_group_copy", icon='COPY_ID') layout.operator("object.vertex_group_copy", icon='COPY_ID')
layout.operator("object.vertex_group_copy_to_linked", icon='LINK_AREA') layout.operator("object.vertex_group_copy_to_linked", icon='LINK_AREA')
layout.operator("object.vertex_group_copy_to_selected", icon='LINK_AREA') layout.operator("object.vertex_group_copy_to_selected", icon='LINK_AREA')

17
source/blender/editors/object/object_vgroup.c
View File

@@ -4324,7 +4324,7 @@ static int vgroup_do_remap(Object *ob, const char *name_array, wmOperator *op)
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
static int vgroup_sort_alphanumeric(void *def_a_ptr, void *def_b_ptr) static int vgroup_sort_name(void *def_a_ptr, void *def_b_ptr)
{ {
bDeformGroup *def_a = (bDeformGroup *)def_a_ptr; bDeformGroup *def_a = (bDeformGroup *)def_a_ptr;
bDeformGroup *def_b = (bDeformGroup *)def_b_ptr; bDeformGroup *def_b = (bDeformGroup *)def_b_ptr;
@@ -4332,12 +4332,15 @@ static int vgroup_sort_alphanumeric(void *def_a_ptr, void *def_b_ptr)
return BLI_natstrcmp(def_a->name, def_b->name); return BLI_natstrcmp(def_a->name, def_b->name);
} }
/* Sorts the weight groups according to the bone hierarchy of the
associated armature (similar to how bones are ordered in the Outliner) */
static void vgroup_sort_bone_hierarchy(Object *ob, ListBase *bonebase) static void vgroup_sort_bone_hierarchy(Object *ob, ListBase *bonebase)
{ {
if (bonebase == NULL) { if (bonebase == NULL) {
Object *armobj = modifiers_isDeformedByArmature(ob); Object *armobj = modifiers_isDeformedByArmature(ob);
if (armobj != NULL) { if (armobj != NULL) {
bonebase = &((struct bArmature *)armobj->data)->bonebase; bArmature *armature = armobj->data;
bonebase = &armature->bonebase;
} }
} }
@@ -4358,7 +4361,7 @@ static void vgroup_sort_bone_hierarchy(Object *ob, ListBase *bonebase)
} }
enum { enum {
SORT_TYPE_ALPHANUMERIC = 0, SORT_TYPE_NAME = 0,
SORT_TYPE_BONEHIERARCHY = 1 SORT_TYPE_BONEHIERARCHY = 1
}; };
@@ -4374,8 +4377,8 @@ static int vertex_group_sort_exec(bContext *C, wmOperator *op)
/*sort vgroup names*/ /*sort vgroup names*/
switch(sort_type) { switch(sort_type) {
case SORT_TYPE_ALPHANUMERIC: case SORT_TYPE_NAME:
BLI_sortlist(&ob->defbase, vgroup_sort_alphanumeric); BLI_sortlist(&ob->defbase, vgroup_sort_name);
break; break;
case SORT_TYPE_BONEHIERARCHY: case SORT_TYPE_BONEHIERARCHY:
vgroup_sort_bone_hierarchy(ob, NULL); vgroup_sort_bone_hierarchy(ob, NULL);
@@ -4398,7 +4401,7 @@ static int vertex_group_sort_exec(bContext *C, wmOperator *op)
void OBJECT_OT_vertex_group_sort(wmOperatorType *ot) void OBJECT_OT_vertex_group_sort(wmOperatorType *ot)
{ {
static EnumPropertyItem vgroup_sort_type[] = { static EnumPropertyItem vgroup_sort_type[] = {
{SORT_TYPE_ALPHANUMERIC, "ALPHANUMERIC", 0, "Alphanumeric", ""}, {SORT_TYPE_NAME, "NAME", 0, "Name", ""},
{SORT_TYPE_BONEHIERARCHY, "BONE_HIERARCHY", 0, "Bone Hierarchy", ""}, {SORT_TYPE_BONEHIERARCHY, "BONE_HIERARCHY", 0, "Bone Hierarchy", ""},
{0, NULL, 0, NULL, NULL} {0, NULL, 0, NULL, NULL}
}; };
@@ -4414,7 +4417,7 @@ void OBJECT_OT_vertex_group_sort(wmOperatorType *ot)
/* flags */ /* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
RNA_def_enum(ot->srna, "sort_type", vgroup_sort_type, SORT_TYPE_ALPHANUMERIC, "Sort type", "Sort type"); RNA_def_enum(ot->srna, "sort_type", vgroup_sort_type, SORT_TYPE_NAME, "Sort type", "Sort type");
} }
static int vgroup_move_exec(bContext *C, wmOperator *op) static int vgroup_move_exec(bContext *C, wmOperator *op)