archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

allow multiple bones to be selected in weight paint mode in a less complicated way (allow Shift+RMB)

Browse Source
This commit is contained in:
Campbell Barton
2011-09-18 15:17:16 +00:00
parent f4207ca417
commit f0071799b6
1 changed files with 13 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
source/blender/editors/armature/editarmature.c
View File

@@ -4276,74 +4276,35 @@ static int bone_looper(Object *ob, Bone *bone, void *data,
return count; return count;
} }
/* Radish */
Bone* get_other_selected_bone(Object *ob) {
Bone *bone;
int i;
bone = get_indexed_bone(ob, 0);
for(i = 0; bone;){
if(bone->flag & BONE_SELECTED) {
return bone;
}
i++;
bone = get_indexed_bone(ob, i);
}
return NULL;
}
/* called from editview.c, for mode-less pose selection */ /* called from editview.c, for mode-less pose selection */
/* assumes scene obact and basact is still on old situation */ /* assumes scene obact and basact is still on old situation */
int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, short hits, short extend) int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, short hits, short extend)
{ {
Object *ob= base->object; Object *ob= base->object;
Bone *nearBone; Bone *nearBone;
if (!ob || !ob->pose) return 0; if (!ob || !ob->pose) return 0;
nearBone= get_bone_from_selectbuffer(scene, base, buffer, hits, 1); nearBone= get_bone_from_selectbuffer(scene, base, buffer, hits, 1);
/* if the bone cannot be affected, don't do anything */ /* if the bone cannot be affected, don't do anything */
if ((nearBone) && !(nearBone->flag & BONE_UNSELECTABLE)) { if ((nearBone) && !(nearBone->flag & BONE_UNSELECTABLE)) {
Object *ob_act= OBACT;
bArmature *arm= ob->data; bArmature *arm= ob->data;
/* since we do unified select, we don't shift+select a bone if the armature object was not active yet */ /* since we do unified select, we don't shift+select a bone if the
/* Radish, I'm doing a select for multibone painting */ * armature object was not active yet.
if (scene->toolsettings->multipaint && (base != scene->basact)) {//if (!(extend) || (base != scene->basact)) { * note, special exception for armature mode so we can do multi-select
Bone *new_act_bone; * we could check for multi-select explicitly but think its fine to
/* Radish */ * always give pradictable behavior in weight paint mode - campbell */
/* only deselect all if they aren't using 'shift' */ if (!(extend) || (base->object != ob_act && !(ob_act->mode & OB_MODE_WEIGHT_PAINT))) {
if(!extend) {
ED_pose_deselectall(ob, 0);
nearBone->flag |= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
arm->act_bone= nearBone;
ED_vgroup_select_by_name(OBACT, nearBone->name);
}
else {
/* Radish deselect this bone specifically if it is selected already */
if (nearBone->flag & BONE_SELECTED) {
nearBone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
if(nearBone == arm->act_bone) {
// make a different bone the active one if it exists
new_act_bone = get_other_selected_bone(ob);
if(new_act_bone) {
new_act_bone->flag |= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
arm->act_bone = new_act_bone;
ED_vgroup_select_by_name(OBACT, new_act_bone->name);
}
}
// or select the bone if they are using shift
} else {
nearBone->flag |= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
arm->act_bone= nearBone;
}
}
DAG_id_tag_update(&OBACT->id, OB_RECALC_DATA);
// XXX old cruft! use notifiers instead
//select_actionchannel_by_name(ob->action, nearBone->name, 1);
} else if (!(extend) || (base != scene->basact)) {
ED_pose_deselectall(ob, 0); ED_pose_deselectall(ob, 0);
nearBone->flag |= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL); nearBone->flag |= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
arm->act_bone= nearBone; arm->act_bone= nearBone;
// XXX old cruft! use notifiers instead
//select_actionchannel_by_name(ob->action, nearBone->name, 1);
} }
else { else {
if (nearBone->flag & BONE_SELECTED) { if (nearBone->flag & BONE_SELECTED) {
@@ -4368,7 +4329,7 @@ int ED_do_pose_selectbuffer(Scene *scene, Base *base, unsigned int *buffer, shor
} }
/* in weightpaint we select the associated vertex group too */ /* in weightpaint we select the associated vertex group too */
if (OBACT && OBACT->mode & OB_MODE_WEIGHT_PAINT) { if (ob_act && ob_act->mode & OB_MODE_WEIGHT_PAINT) {
if (nearBone == arm->act_bone) { if (nearBone == arm->act_bone) {
ED_vgroup_select_by_name(OBACT, nearBone->name); ED_vgroup_select_by_name(OBACT, nearBone->name);
DAG_id_tag_update(&OBACT->id, OB_RECALC_DATA); DAG_id_tag_update(&OBACT->id, OB_RECALC_DATA);