sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

bugfix [#22831] transform problem with hidden parent object

Browse Source 
dont allow selecting of hidden objects or restrict selected object by using the BASE_SELECTABLE macro.
This commit is contained in:
Campbell Barton 2010-09-07 10:24:12 +00:00
parent ea95d71067
commit 28d18d59a3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_view3d/view3d_select.c
View File

@ -1055,7 +1055,7 @@ static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int
base= FIRSTBASE;
while(base) {
if(base->lay & v3d->lay) {
if(BASE_SELECTABLE(v3d, base)) {
if(base->selcol==selcol) break;
}
base= base->next;
@ -1074,7 +1074,7 @@ static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int
if(base==startbase) break;
}
if(base->lay & v3d->lay) {
if(BASE_SELECTABLE(v3d, base)) {
for(a=0; a<hits; a++) {
if(has_bones) {
/* skip non-bone objects */
@ -1623,7 +1623,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
} else {
while(base) {
Base *next = base->next;
if(base->lay & v3d->lay) {
if(BASE_SELECTABLE(v3d, base)) {
ED_base_object_select(base, BA_DESELECT);
}
base= next;
@ -1652,7 +1652,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
while(base && hits) {
Base *next = base->next;
if(base->lay & v3d->lay) {
if(BASE_SELECTABLE(v3d, base)) {
while (base->selcol == (*col & 0xFFFF)) { /* we got an object */
if(*col & 0xFFFF0000) { /* we got a bone */
@ -2092,7 +2092,7 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
Base *base;
selecting= selecting?BA_SELECT:BA_DESELECT;
for(base= FIRSTBASE; base; base= base->next) {
if(base->lay & v3d->lay) {
if(BASE_SELECTABLE(v3d, base)) {
project_short(ar, base->object->obmat[3], &base->sx);
if(base->sx!=IS_CLIPPED) {
int dx= base->sx-x;