diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-19 16:05:45 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-19 16:05:45 +0400 |
| commit | 2f9f0710d140466f3b8030b66f4637b7f12b9d4a (patch) | |
| tree | e6d677c854c99f0416045d8c31577082d2bc6061 /source/blender/render/intern/include | |
| parent | 27de7cc2e178167ec51d2f3706ad6cadf2c68e65 (diff) | |
Revert last merge from trunk
svn merge -r 16539:16538 https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-jaguarandi/
Diffstat (limited to 'source/blender/render/intern/include')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 7e2194549cc..f83bbd7e8b2 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -418,8 +418,7 @@ typedef struct LampRen { float xs, ys, dist; float co[3]; - short type; - int mode; + short type, mode; float r, g, b, k; float energy, haint; int lay; |