[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46224] trunk/blender/source/blender/gpu/ intern/gpu_draw.c: Fix #31108: entering local view with glsl shows objects black.

[Brecht Van Lommel]

Revision: 46224
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46224
Author:   blendix
Date:     2012-05-03 09:31:59 +0000 (Thu, 03 May 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_draw.c

Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c	2012-05-03 07:32:26 UTC (rev 46223)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c	2012-05-03 09:31:59 UTC (rev 46224)
@@ -1087,7 +1087,7 @@
 	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;