[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11069] branches/soc-2007-maike/source/ blender/src/glsl_drawobject.c: Light only illuminated object in the same layer, now corrected

[Miguel Torres Lima]

Revision: 11069
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11069
Author:   maike
Date:     2007-06-26 14:41:05 +0200 (Tue, 26 Jun 2007)

Log Message:
-----------
Light only illuminated object in the same layer, now corrected

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/src/glsl_drawobject.c

Modified: branches/soc-2007-maike/source/blender/src/glsl_drawobject.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_drawobject.c	2007-06-26 12:40:17 UTC (rev 11068)
+++ branches/soc-2007-maike/source/blender/src/glsl_drawobject.c	2007-06-26 12:41:05 UTC (rev 11069)
@@ -56,7 +56,7 @@
     char *vec = glsl_string(3, 0, "lights[", GINT, i, 0, "].vec");
     char *layer = glsl_string(3, 0, "lights[", GINT, i, 0, "].layer");
     char *eye = glsl_string(1, 0, "eye");
-
+    Lamp *lamp = light->blen_light;
     Object *lamp_obj = light->obj;
 
     float vect[3] = { lamp_obj->obmat[3][0], 
@@ -83,7 +83,7 @@
     glUniform3fv(glsl_uniform_location(program, vec), 1, vecc);
 
  
-    if(obj->lay & lamp_obj->lay){
+    if(obj->lay & lamp_obj->lay || !(lamp->mode & LA_LAYER)){
       glUniform1i(glsl_uniform_location(program, layer), 1);
     } 
     else{