diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-02-21 21:10:27 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-21 21:10:27 +0400 |
commit | 9a86abd4406fa63ac44ff8e905a1b714d69a2206 (patch) | |
tree | 1401edf44cbc718be752d917e07d9c304a530b86 /source/blender | |
parent | a239700f439275df28136b846be032da70e18d70 (diff) |
code cleanup: remove unused runtime var - World.fastcol
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 3 | ||||
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 10 |
2 files changed, 1 insertions, 12 deletions
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 8a14564f8a4..02dc81ccd4d 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -59,10 +59,7 @@ typedef struct World { float horr, horg, horb; float zenr, zeng, zenb; float ambr, ambg, ambb; - float pad2; - unsigned int fastcol; - /** * Exposure= mult factor. unused now, but maybe back later. Kept in to be upward compat. * New is exp/range control. linfac & logfac are constants... don't belong in diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index b161bb7d193..00a4da2e9c4 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4015,18 +4015,10 @@ static void set_renderlayer_lightgroups(Render *re, Scene *sce) void init_render_world(Render *re) { int a; - char *cp; if (re->scene && re->scene->world) { re->wrld= *(re->scene->world); - - cp= (char *)&re->wrld.fastcol; - - cp[0]= 255.0f*re->wrld.horr; - cp[1]= 255.0f*re->wrld.horg; - cp[2]= 255.0f*re->wrld.horb; - cp[3]= 1; - + copy_v3_v3(re->grvec, re->viewmat[2]); normalize_v3(re->grvec); copy_m3_m4(re->imat, re->viewinv); |