diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-05-14 16:36:07 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-05-14 16:36:07 +0400 |
| commit | 003534513645576215092b79f1aa46e85c89e3bd (patch) | |
| tree | edfaa0542e123e610952c68d88a2d1c8a213516b | |
| parent | 34f99fa4b9e5a370ee208db247f56fcbea4e71f9 (diff) | |
Bugfix, sorta :)
Removed option to choose rendering to yafray. New yafaray is better, and
already is being linked as option on the blender.org download page.
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 | ||||
| -rw-r--r-- | source/blender/src/buttons_scene.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index cbf2516da77..6c5a5bd551c 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -8092,6 +8092,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main) wrld->occlusionRes = 128; } } + + if (main->versionfile < 249) { + Scene *sce; + for (sce= main->scene.first; sce; sce= sce->id.next) + sce->r.renderer= 0; + + } + /* WATCH IT!!!: pointers from libdata have not been converted yet here! */ /* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */ diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index 577486135b4..d140001ba2d 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -2277,15 +2277,7 @@ static void render_panel_render(void) if(uiNewPanel(curarea, block, "Render", "Render", 320, 0, 318, 204)==0) return; uiBlockBeginAlign(block); - uiDefBut(block, BUT,B_DORENDER,"RENDER", 369, 164, 191,37, 0, 0, 0, 0, 0, "Render the current frame (F12)"); -#ifndef DISABLE_YAFRAY - /* yafray: on request, render engine menu is back again, and moved to Render panel */ - uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0|YafRay %x1", - 369, 142, 191, 20, &G.scene->r.renderer, 0, 0, 0, 0, "Choose rendering engine"); -#else - uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0", - 369, 142, 191, 20, &G.scene->r.renderer, 0, 0, 0, 0, "Choose rendering engine"); -#endif /* disable yafray */ + uiDefBut(block, BUT,B_DORENDER,"RENDER", 369, 142, 191,59, 0, 0, 0, 0, 0, "Render the current frame (F12)"); uiBlockBeginAlign(block); if((G.scene->r.scemode & R_FULL_SAMPLE) && (G.scene->r.scemode & R_EXR_TILE_FILE)) |