[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15296] branches/apricot/source/blender/ gpu/intern/gpu_material.c: Apricot Branch: fix bug with shaders going black .
Brecht Van Lommel
brechtvanlommel at pandora.be
Sat Jun 21 16:31:39 CEST 2008
Revision: 15296
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15296
Author: blendix
Date: 2008-06-21 16:31:38 +0200 (Sat, 21 Jun 2008)
Log Message:
-----------
Apricot Branch: fix bug with shaders going black.
Modified Paths:
--------------
branches/apricot/source/blender/gpu/intern/gpu_material.c
Modified: branches/apricot/source/blender/gpu/intern/gpu_material.c
===================================================================
--- branches/apricot/source/blender/gpu/intern/gpu_material.c 2008-06-21 12:23:04 UTC (rev 15295)
+++ branches/apricot/source/blender/gpu/intern/gpu_material.c 2008-06-21 14:31:38 UTC (rev 15296)
@@ -505,7 +505,7 @@
if((lamp->mode & LA_ONLYSHADOW) && !(ma->mode & MA_SHADOW))
return;
-
+
vn= shi->vn;
view= shi->view;
@@ -628,11 +628,17 @@
static void material_lights(GPUShadeInput *shi, GPUShadeResult *shr)
{
Base *base;
+ Object *ob;
- for(base=G.scene->base.first; base; base=base->next)
- if(base->object->type==OB_LAMP && base->object->gpulamp)
- //if(!G.vd || (base->lay & G.vd->lay))
- shade_one_light(shi, shr, base->object->gpulamp);
+ for(base=G.scene->base.first; base; base=base->next) {
+ ob= base->object;
+
+ if(ob->type==OB_LAMP) {
+ GPU_lamp_from_blender(ob, ob->data);
+ if(ob->gpulamp)
+ shade_one_light(shi, shr, ob->gpulamp);
+ }
+ }
}
static void texture_rgb_blend(GPUMaterial *mat, GPUNodeLink *tex, GPUNodeLink *out, GPUNodeLink *fact, GPUNodeLink *facg, int blendtype, GPUNodeLink **in)
More information about the Bf-blender-cvs
mailing list