[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21068] branches/sim_physics/source/ blender/render/intern/source/texture.c: * fix for small bug in volume texture stack

[Matt Ebb]

Revision: 21068
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21068
Author:   broken
Date:     2009-06-22 00:17:06 +0200 (Mon, 22 Jun 2009)

Log Message:
-----------
* fix for small bug in volume texture stack

Modified Paths:
--------------
    branches/sim_physics/source/blender/render/intern/source/texture.c

Modified: branches/sim_physics/source/blender/render/intern/source/texture.c
===================================================================
--- branches/sim_physics/source/blender/render/intern/source/texture.c  
2009-06-21 20:01:47 UTC (rev 21067)
+++ branches/sim_physics/source/blender/render/intern/source/texture.c  
2009-06-21 22:17:06 UTC (rev 21068)
@@ -1289,7 +1289,7 @@
                        texres->tg= col[1];
                        texres->tb= col[2];
                        texres->ta= col[3];
-                       retval |= 1;
+                       retval |= TEX_RGB;
                }
        }
        return retval;
@@ -1636,8 +1636,11 @@
                                        tcol[0]=texres.tr;
                                        tcol[1]=texres.tg;
                                        tcol[2]=texres.tb;
+                                       if(texres.talpha)
+                                               texres.tin= texres.ta;
                                }
                                
+                               /* used for emit */
                                if((mapto_flag & MAP_COL) && (mtex->mapto & 
MAP_COL)) {
                                        texture_rgb_blend(col, tcol, col, 
texres.tin, colfac, mtex->blendtype);
                                }


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs