svn merge -r 16593:16648 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender-staging.git] / source / blender / render / intern / source / convertblender.c

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 33f32a4744e306fb4d41e553a2a1d6fa3d9a0ea7..d5ac2fa17480fa56069c6d9e37ffc093a53383fe 100644 (file)
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3456,6 +3456,9 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
        lar->r= lar->energy*la->r;
        lar->g= lar->energy*la->g;
        lar->b= lar->energy*la->b;
+       lar->shdwr= la->shdwr;
+       lar->shdwg= la->shdwg;
+       lar->shdwb= la->shdwb;
        lar->k= la->k;
 
        // area
@@ -3608,7 +3611,10 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
 
        for(c=0; c<MAX_MTEX; c++) {
                if(la->mtex[c] && la->mtex[c]->tex) {
-                       lar->mode |= LA_TEXTURE;
+                       if (la->mtex[c]->mapto & LAMAP_COL) 
+                               lar->mode |= LA_TEXTURE;
+                       if (la->mtex[c]->mapto & LAMAP_SHAD)
+                               lar->mode |= LA_SHAD_TEX;
 
                        if(G.rendering) {
                                if(re->osa) {