Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-10-02 23:45:53 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-10-02 23:45:53 +0400
commit1d2b96fa81a4d9ee82e328e144302192a3d95d3f (patch)
tree61f370122d14d8ae7442d1aa0494cd968f94b39a /source/blender/editors/space_view3d/space_view3d.c
parent3aef138175496d059ce483f9e097eaff063b7a69 (diff)
set the view3d used layer to be an unsigned int, mask out localview layers to avoid flag mismatch when checking if it changed.
Diffstat (limited to 'source/blender/editors/space_view3d/space_view3d.c')
-rw-r--r--source/blender/editors/space_view3d/space_view3d.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 6dc37313698..8a215834c38 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -533,16 +533,16 @@ static void view3d_recalc_used_layers(ARegion *ar, wmNotifier *wmn, Scene *scene
{
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;