diff options
author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-19 18:15:36 +0400 |
---|---|---|
committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-19 18:15:36 +0400 |
commit | 656ee61718d85f9366115756ba28e4b53f36d6b2 (patch) | |
tree | cca1c89160ea2facf62675bfd9313a0c6a052d30 /source/blender/render/intern/include | |
parent | 2f9f0710d140466f3b8030b66f4637b7f12b9d4a (diff) |
Merge from trunk
(The last time there was some files missing due to failed connection to svn server while merging.. thats why this stuff of reverting last merge and redoing it)
svn merge -r 16231:16608 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/render/intern/include')
-rw-r--r-- | source/blender/render/intern/include/render_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index f83bbd7e8b2..7e2194549cc 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -418,7 +418,8 @@ typedef struct LampRen { float xs, ys, dist; float co[3]; - short type, mode; + short type; + int mode; float r, g, b, k; float energy, haint; int lay; |