[Bf-blender-cvs] [300f448] master: View3D: no need to mask mask out localview for each object
Campbell Barton
noreply at git.blender.org
Thu Apr 17 16:30:35 CEST 2014
Commit: 300f4482e8748818ea6867d6c47acde3bb905d6d
Author: Campbell Barton
Date: Thu Apr 17 20:38:21 2014 +1000
https://developer.blender.org/rB300f4482e8748818ea6867d6c47acde3bb905d6d
View3D: no need to mask mask out localview for each object
===================================================================
M source/blender/editors/space_view3d/view3d_draw.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index d22dca4..17026a4 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2656,7 +2656,7 @@ static void view3d_draw_objects(
/* then draw not selected and the duplis, but skip editmode object */
for (base = scene->base.first; base; base = base->next) {
- lay_used |= base->lay & ((1 << 20) - 1);
+ lay_used |= base->lay;
if (v3d->lay & base->lay) {
@@ -2671,7 +2671,8 @@ static void view3d_draw_objects(
}
}
- v3d->lay_used = lay_used;
+ /* mask out localview */
+ v3d->lay_used = lay_used & ((1 << 20) - 1);
/* draw selected and editmode */
for (base = scene->base.first; base; base = base->next) {
More information about the Bf-blender-cvs
mailing list