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

svn merge -r 22450:22627 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender

Browse Source
This commit is contained in:
Matt Ebb
2009-08-19 11:18:52 +00:00
parent 8480ea2b0a e611c4756f
commit 132277f098
498 changed files with 10819 additions and 6386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/render/extern/include/RE_shader_ext.h vendored
View File

@@ -55,7 +55,6 @@ typedef struct ShadeResult
float refl[3];
float refr[3];
float nor[3];
float rad[3];
float winspeed[4];
} ShadeResult;
@@ -132,7 +131,7 @@ typedef struct ShadeInput
float layerfac;
/* texture coordinates */
float lo[3], gl[3], ref[3], orn[3], winco[3], sticky[3], vcol[4], rad[3];
float lo[3], gl[3], ref[3], orn[3], winco[3], sticky[3], vcol[4];
float refcol[4], displace[3];
float strandco, tang[3], nmaptang[3], stress, winspeed[4];
float duplilo[3], dupliuv[3];