kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix, sorta :)

Browse Source 
Removed option to choose rendering to yafray. New yafaray is better, and
already is being linked as option on the blender.org download page.
This commit is contained in:
Ton Roosendaal 2009-05-14 12:36:07 +00:00
parent 34f99fa4b9
commit 0035345136
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenloader/intern/readfile.c
View File

@ -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! */

10
source/blender/src/buttons_scene.c
View File

@ -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))