diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-03 13:31:59 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-03 13:31:59 +0400 |
| commit | dcdf768147d81551864cbc415dfd69176a3fc173 (patch) | |
| tree | 1bf4fa6d5204a8e61efa548f2746af2b1c9809de /source/blender/gpu | |
| parent | d3a5fd55089cf76bcec8d8512566046b9d72b659 (diff) | |
Fix #31108: entering local view with glsl shows objects black. Now keeps lamps
affecting the material even if they are not part of the local view.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 09ed3c6f5fb..1c1cf8017f6 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1087,7 +1087,7 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O GMS.gob = ob; GMS.gscene = scene; GMS.totmat= ob->totcol+1; /* materials start from 1, default material is 0 */ - GMS.glay= v3d->lay; + GMS.glay= (v3d->localvd)? v3d->localvd->lay: v3d->lay; /* keep lamps visible in local view */ GMS.gviewmat= rv3d->viewmat; GMS.gviewinv= rv3d->viewinv; |