griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Made EditMode armature border-selecting smarter.

Browse Source 
Rule now is:
- If there's points in the border, only the points get selected (and an
  entire Bone when both points are in border)
- If no points in the border, the tip gets selected for connected Bones,
  the entire Bone gets selected for non-connected Bones.

OK OOPz, check this! :)
This commit is contained in:
Ton Roosendaal
2005-09-20 08:48:06 +00:00
parent 820bcb4be8
commit 3ef1f0f3e3
2 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/editarmature.c
View File

@@ -907,7 +907,7 @@ void mouse_armature(void)
deselectall_armature(0);
}
/* by definition the non-root non-connected bones have no root point drawn,
/* by definition the non-root connected bones have no root point drawn,
so a root selection needs to be delivered to the parent tip,
countall() (bad location) flushes these flags */

58
source/blender/src/editview.c
View File

@@ -1573,28 +1573,52 @@ void borderselect(void)
}
else if(G.obedit->type==OB_ARMATURE) {
EditBone *ebone;
/* clear flag we use to detect point was affected */
for(ebone= G.edbo.first; ebone; ebone= ebone->next)
ebone->flag &= ~BONE_DONE;
hits= view3d_opengl_select(buffer, MAXPICKBUF, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
base= FIRSTBASE;
/* first we only check points inside the border */
for (a=0; a<hits; a++){
index = buffer[(4*a)+3];
if (val==LEFTMOUSE){
if (index!=-1) {
ebone = BLI_findlink(&G.edbo, index & ~(BONESEL_ANY));
if (index & (BONESEL_TIP|BONESEL_BONE))
ebone->flag |= BONE_TIPSEL;
if (index & (BONESEL_ROOT|BONESEL_BONE))
ebone->flag |= BONE_ROOTSEL;
if (index!=-1) {
ebone = BLI_findlink(&G.edbo, index & ~(BONESEL_ANY));
if (index & BONESEL_TIP) {
ebone->flag |= BONE_DONE;
if (val==LEFTMOUSE) ebone->flag |= BONE_TIPSEL;
else ebone->flag &= ~BONE_TIPSEL;
}
if (index & BONESEL_ROOT) {
ebone->flag |= BONE_DONE;
if (val==LEFTMOUSE) ebone->flag |= BONE_ROOTSEL;
else ebone->flag &= ~BONE_ROOTSEL;
}
}
else{
if (index!=-1){
ebone = BLI_findlink(&G.edbo, index & ~(BONESEL_ANY));
if (index & (BONESEL_TIP|BONESEL_BONE))
ebone->flag &= ~BONE_TIPSEL;
if (index & (BONESEL_ROOT|BONESEL_BONE))
ebone->flag &= ~BONE_ROOTSEL;
}
/* now we have to flush tag from parents... */
for(ebone= G.edbo.first; ebone; ebone= ebone->next) {
if(ebone->parent && (ebone->flag & BONE_CONNECTED)) {
if(ebone->parent->flag & BONE_DONE)
ebone->flag |= BONE_DONE;
}
}
/* only select/deselect entire bones when no points where in the rect */
for (a=0; a<hits; a++){
index = buffer[(4*a)+3];
if (index!=-1) {
ebone = BLI_findlink(&G.edbo, index & ~(BONESEL_ANY));
if (index & BONESEL_BONE) {
if(!(ebone->flag & BONE_DONE)) {
if (val==LEFTMOUSE)
ebone->flag |= (BONE_ROOTSEL|BONE_TIPSEL|BONE_SELECTED);
else
ebone->flag &= ~(BONE_ROOTSEL|BONE_TIPSEL|BONE_SELECTED);
}
}
}
}