archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* fix for small bug in volume texture stack

Browse Source
This commit is contained in:
Matt Ebb
2009-06-21 22:17:06 +00:00
parent 3b2ec94977
commit d5e9eb7d76
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/render/intern/source/texture.c
View File

@@ -1289,7 +1289,7 @@ static int multitex(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex,
texres->tg= col[1];
texres->tb= col[2];
texres->ta= col[3];
retval |= 1;
retval |= TEX_RGB;
}
}
return retval;
@@ -1636,8 +1636,11 @@ void do_volume_tex(ShadeInput *shi, float *xyz, int mapto_flag, float *col, floa
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);
}