diff options
| author | Ton Roosendaal <ton@blender.org> | 2003-08-17 19:57:12 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2003-08-17 19:57:12 +0400 |
| commit | 0b2d2868f1467c1144f88b8923b3ef22f7e96a63 (patch) | |
| tree | d78a4568a9ebe3b5e5992833746f447166f272e6 /source | |
| parent | af395ada123b31d743ca0171d07d8f43a930c0df (diff) | |
- fixed bug #448
now 'only shadow' lamps won't give light when rendering without shadows.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/pixelshading.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 4 | ||||
| -rw-r--r-- | source/blender/renderconverter/intern/convertBlenderScene.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c index c9ddd8d189c..3e83583806d 100644 --- a/source/blender/render/intern/source/pixelshading.c +++ b/source/blender/render/intern/source/pixelshading.c @@ -1051,7 +1051,7 @@ void shadeLampLusFloat() /* test for lamplayer */ if(lar->mode & LA_LAYER) if((lar->lay & R.vlr->lay)==0) continue; - /* lampdist calculation */ + /* lampdist calculation */ if(lar->type==LA_SUN || lar->type==LA_HEMI) { VECCOPY(lv, lar->vec); lampdist= 1.0; diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 936f91bdccd..d9066494284 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -1681,7 +1681,7 @@ void shade_lamp_loop() /* test for lamp layer */ if(lar->mode & LA_LAYER) if((lar->lay & R.vlr->lay)==0) continue; - + /* lampdist calculation */ if(lar->type==LA_SUN || lar->type==LA_HEMI) { VECCOPY(lv, lar->vec); @@ -1757,7 +1757,7 @@ void shade_lamp_loop() soft= (3.0*t-2.0*t*i); inpr*= soft; } - if(lar->mode & LA_ONLYSHADOW && lar->shb) { + if((lar->mode & LA_ONLYSHADOW) && lar->shb) { if(ma->mode & MA_SHADOW) { /* dot product positive: front side face! */ inp= vn[0]*lv[0] + vn[1]*lv[1] + vn[2]*lv[2]; diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index e8acc2b9a8a..2008236b0ec 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -1831,7 +1831,6 @@ void RE_add_render_lamp(Object *ob, int doshadbuf) if(lar->mode & LA_ONLYSHADOW) { if((lar->mode & LA_SHAD)==0) lar->mode -= LA_ONLYSHADOW; - else if((R.r.mode & R_SHADOW)==0) lar->mode -= LA_ONLYSHADOW; } } |