diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
| commit | bb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch) | |
| tree | 6fb8da94c6e43098c606f768e722484b04b8645c /source/blender/makesdna/DNA_world_types.h | |
| parent | 37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff) | |
| parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) | |
merge with trunk at r31523
Diffstat (limited to 'source/blender/makesdna/DNA_world_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 66d31467c4a..42c80f4b8b5 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -52,11 +52,11 @@ typedef struct World { short colormodel, totex; short texact, mistype; - - /* TODO - hork, zenk and ambk are not used, should remove at some point (Campbell) */ - float horr, horg, horb, hork; - float zenr, zeng, zenb, zenk; - float ambr, ambg, ambb, ambk; + + float horr, horg, horb; + float zenr, zeng, zenb; + float ambr, ambg, ambb; + float pad2; unsigned int fastcol; |