diff options
author | Matt Ebb <matt@mke3.net> | 2009-08-19 15:18:52 +0400 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2009-08-19 15:18:52 +0400 |
commit | 132277f0989b0b7d99d883d22a2bade6534ae44c (patch) | |
tree | 6d26c46f62749470130375061381353fd54c2364 /source/blender/render/extern/include/RE_shader_ext.h | |
parent | 8480ea2b0abacae00c90d37e7d99fa5e0c89eebe (diff) | |
parent | e611c4756fa17c57855123dc2b5c2c2408b0d790 (diff) |
svn merge -r 22450:22627 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Diffstat (limited to 'source/blender/render/extern/include/RE_shader_ext.h')
-rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 36613588ff3..435e3ddc07f 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -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]; |