Scene.c - scene.objects.context how dosnt include hidden objects

editview.c - deselect all ignores restricted objects
headerbuttons.c - removing a material didnt redraw the 3d view
vpaint.c - disable vpaint for mesh libdata as well as object libdata

1 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c
index a787424517a..f4694120f74 100644
--- a/source/blender/src/editview.c
+++ b/source/blender/src/editview.c
@@ -904,17 +904,17 @@ void deselectall(void)	/* is toggle */
 	base= FIRSTBASE;
 	while(base) {
 		/* is there a visible selected object */
-		if TESTBASE(base) {
-			ok= a= 1;
-			break;
-		}
-		/* are there any objects in the view*/
 		if(base->lay & G.vd->lay &&
 		  (base->object->restrictflag & OB_RESTRICT_VIEW)==0 &&
 		  (base->object->restrictflag & OB_RESTRICT_SELECT)==0
-		)
-			ok=1;
-		
+		) {
+			if (base->flag & SELECT) {
+				ok= a= 1;
+				break;
+			} else {
+				ok=1;
+			}
+		}
 		base= base->next;
 	}