armature editmode: option for select mirror to use active bone only.

This commit is contained in:
Campbell Barton
2013-11-17 04:41:37 +11:00
parent 4fd66d7c0c
commit ed1146b9db
2 changed files with 20 additions and 1 deletions

View File

@@ -1054,7 +1054,8 @@ static int armature_select_mirror_exec(bContext *C, wmOperator *op)
{ {
Object *obedit = CTX_data_edit_object(C); Object *obedit = CTX_data_edit_object(C);
bArmature *arm = obedit->data; bArmature *arm = obedit->data;
EditBone *ebone; EditBone *ebone, *ebone_mirror_act = NULL;
const bool active_only = RNA_boolean_get(op->ptr, "only_active");
const bool extend = RNA_boolean_get(op->ptr, "extend"); const bool extend = RNA_boolean_get(op->ptr, "extend");
for (ebone = arm->edbo->first; ebone; ebone = ebone->next) { for (ebone = arm->edbo->first; ebone; ebone = ebone->next) {
@@ -1072,12 +1073,25 @@ static int armature_select_mirror_exec(bContext *C, wmOperator *op)
{ {
const int flag_mirror = EBONE_PREV_FLAG_GET(ebone_mirror); const int flag_mirror = EBONE_PREV_FLAG_GET(ebone_mirror);
flag_new |= flag_mirror; flag_new |= flag_mirror;
if (ebone == arm->act_edbone) {
ebone_mirror_act = ebone_mirror;
}
/* skip all but the active or its mirror */
if (active_only && !ELEM(arm->act_edbone, ebone, ebone_mirror)) {
continue;
}
} }
ED_armature_ebone_selectflag_set(ebone, flag_new); ED_armature_ebone_selectflag_set(ebone, flag_new);
} }
} }
if (ebone_mirror_act) {
arm->act_edbone = ebone_mirror_act;
}
ED_armature_sync_selection(arm->edbo); ED_armature_sync_selection(arm->edbo);
WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, obedit); WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, obedit);
@@ -1100,5 +1114,6 @@ void ARMATURE_OT_select_mirror(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */ /* properties */
RNA_def_boolean(ot->srna, "only_active", false, "Active Only", "Only operate on the active bone");
RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend the selection"); RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend the selection");
} }

View File

@@ -887,5 +887,9 @@ void POSE_OT_select_flip_active(wmOperatorType *ot)
/* flags */ /* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
RNA_def_boolean(ot->srna, "only_active", false, "Active Only", "Only operate on the active bone");
RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend the selection");
} }