diff options
author | Ton Roosendaal <ton@blender.org> | 2006-07-07 01:18:06 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-07-07 01:18:06 +0400 |
commit | a156ecb7f5a047b024ae5238718821a678abd414 (patch) | |
tree | 98bc9c584c296df51485f2fb0d5cd3292107a14a /source/blender | |
parent | a31ba1edbe93e1e49661df89ccb20b3d06884ad4 (diff) |
Two fixes, venomgfx Fraka bird test!
- AO "Use Distances" can not use 'sky texture' for colors, that bug was
fixed in UI (prevent settings to combine), but better also gets fixed
on reading files.
- Backbuf render, when not existed, didn't initialize backdrop color to 0.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 10 | ||||
-rw-r--r-- | source/blender/render/intern/source/pixelshading.c | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b23dc86a74f..2afcbc85694 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5398,11 +5398,13 @@ static void do_versions(FileData *fd, Library *lib, Main *main) bArmature *arm; bNodeTree *ntree; - /* Migrate to Bullet for games, except for the NaN versions */ - /* People can still explicitely choose for Sumo (after 2.42 is out) */ - if(main->versionfile > 225) { - for (wo = main->world.first; wo; wo= wo->id.next) + for (wo = main->world.first; wo; wo= wo->id.next) { + /* Migrate to Bullet for games, except for the NaN versions */ + /* People can still explicitely choose for Sumo (after 2.42 is out) */ + if(main->versionfile > 225) wo->physicsEngine = WOPHY_BULLET; + if(WO_AODIST == wo->aomode) + wo->aocolor= WO_AOPLAIN; } /* updating layers still */ diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c index fbd7d4ee04d..42610c9f4d9 100644 --- a/source/blender/render/intern/source/pixelshading.c +++ b/source/blender/render/intern/source/pixelshading.c @@ -477,6 +477,11 @@ void renderSkyPixelFloat(float *collector, float x, float y, float *rco) static void fillBackgroundImage(float *collector, float fx, float fy) { + collector[0] = 0.0; + collector[1] = 0.0; + collector[2] = 0.0; + collector[3] = 0.0; + if(R.backbuf) { float dx= 1.0f/(float)R.winx; float dy= 1.0f/(float)R.winy; |