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

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20855:20928

Browse Source 
Sequencer changes from source/blender/src coming next
This commit is contained in:
Campbell Barton
2009-06-16 14:21:58 +00:00
parent 2d40b8d56f 1025b750ee
commit a1cf7988c1
28 changed files with 540 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2418,13 +2418,13 @@ void do_lamp_tex(LampRen *la, float *lavec, ShadeInput *shi, float *colf, int ef
/* placement */
if(mtex->projx) texvec[0]= mtex->size[0]*(co[mtex->projx-1]+mtex->ofs[0]);
if(mtex->projx && co) texvec[0]= mtex->size[0]*(co[mtex->projx-1]+mtex->ofs[0]);
else texvec[0]= mtex->size[0]*(mtex->ofs[0]);
if(mtex->projy) texvec[1]= mtex->size[1]*(co[mtex->projy-1]+mtex->ofs[1]);
if(mtex->projy && co) texvec[1]= mtex->size[1]*(co[mtex->projy-1]+mtex->ofs[1]);
else texvec[1]= mtex->size[1]*(mtex->ofs[1]);
if(mtex->projz) texvec[2]= mtex->size[2]*(co[mtex->projz-1]+mtex->ofs[2]);
if(mtex->projz && co) texvec[2]= mtex->size[2]*(co[mtex->projz-1]+mtex->ofs[2]);
else texvec[2]= mtex->size[2]*(mtex->ofs[2]);
if(shi->osatex) {