[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31808] trunk/blender/source/blender/ editors/space_view3d/view3d_select.c: bugfix [#22831] transform problem with hidden parent object

[Campbell Barton]

Revision: 31808
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31808
Author:   campbellbarton
Date:     2010-09-07 12:24:12 +0200 (Tue, 07 Sep 2010)

Log Message:
-----------
bugfix [#22831] transform problem with hidden parent object
dont allow selecting of hidden objects or restrict selected object by using the BASE_SELECTABLE macro.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_select.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2010-09-07 09:15:59 UTC (rev 31807)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2010-09-07 10:24:12 UTC (rev 31808)
@@ -1055,7 +1055,7 @@
 		
 		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 @@
 				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 @@
 			} 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 @@
 			
 			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 @@
 		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;