[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32266] trunk/blender/source/blender: set the view3d used layer to be an unsigned int, mask out localview layers to avoid flag mismatch when checking if it changed .

[Campbell Barton]

Revision: 32266
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32266
Author:   campbellbarton
Date:     2010-10-02 21:45:53 +0200 (Sat, 02 Oct 2010)

Log Message:
-----------
set the view3d used layer to be an unsigned int, mask out localview layers to avoid flag mismatch when checking if it changed.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/space_view3d.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/makesdna/DNA_view3d_types.h

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-10-02 19:38:09 UTC (rev 32265)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-10-02 19:45:53 UTC (rev 32266)
@@ -533,16 +533,16 @@
 {
 	wmWindow *win= wmn->wm->winactive;
 	ScrArea *sa;
-	int lay_used= 0;
+	unsigned int lay_used= 0;
 	Base *base;
 
 	if (!win) return;
 
 	base= scene->base.first;
 	while(base) {
-		lay_used|= base->lay;
+		lay_used |= base->lay & ((1<<20)-1); /* ignore localview */
 
-		if ((lay_used & ((1<<20)-1)) == (1<<20)-1)
+		if (lay_used == (1<<20)-1)
 			break;
 
 		base= base->next;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2010-10-02 19:38:09 UTC (rev 32265)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2010-10-02 19:45:53 UTC (rev 32266)
@@ -2214,7 +2214,8 @@
 	Base *base;
 	Object *ob;
 	float backcol[3];
-	int retopo= 0, sculptparticle= 0, lay_used= 0;
+	int retopo= 0, sculptparticle= 0;
+	unsigned int lay_used;
 	Object *obact = OBACT;
 	char *grid_unit= NULL;
 
@@ -2321,7 +2322,7 @@
 
 	/* then draw not selected and the duplis, but skip editmode object */
 	for(base= scene->base.first; base; base= base->next) {
-		lay_used |= base->lay;
+		lay_used |= base->lay & ((1<<20)-1);
 
 		if(v3d->lay & base->lay) {
 			

Modified: trunk/blender/source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2010-10-02 19:38:09 UTC (rev 32265)
+++ trunk/blender/source/blender/makesdna/DNA_view3d_types.h	2010-10-02 19:45:53 UTC (rev 32266)
@@ -139,7 +139,7 @@
 	
 	float viewquat[4], dist, pad1;	/* XXX depricated */
 	
-	int lay_used; /* used while drawing */
+	unsigned int lay_used; /* used while drawing */
 	
 	short persp;	/* XXX depricated */
 	short view;	/* XXX depricated */