diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-10-18 09:45:47 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-10-18 09:45:47 +0400 |
| commit | 88446eeca4b6f9d31928a538e3a39d04f1d06976 (patch) | |
| tree | 069b6135aa98b631a1e37485562190bd0428d084 /source/blender/src | |
| parent | 134e5622193cd4eb168b0457208ed6794b5935df (diff) | |
Patch 5105 by Joshua Leung (Aligorith), slightly modified by me
* Add WITH_BF_YAFRAY, which per default is 'true', so no visible changes for developers (and users).
Set WITH_BF_YAFRAY to 'false', and you'll save some major compile time :) Also handy if you're strapped for memory and compilation fails on yafray compilation due
to this.
- this commit also has a few whitespace changes and
- made BF_NO_ELBEEM a proper BoolOption. This will be renamed to WITH_BF_ELBEEM in the near future...
Diffstat (limited to 'source/blender/src')
| -rw-r--r-- | source/blender/src/SConscript | 7 | ||||
| -rw-r--r-- | source/blender/src/buttons_scene.c | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index 0663cb01c5d..2e0f632ca85 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -20,6 +20,9 @@ incs += ' ' + env['BF_OPENGL_INC'] defs = [] +if env['WITH_BF_YAFRAY'] == 0: + defs.append('DISABLE_YAFRAY') + if env['WITH_BF_INTERNATIONAL'] == 1: incs += ' ../ftfont' defs.append('INTERNATIONAL') @@ -37,8 +40,8 @@ if env['WITH_BF_FFMPEG'] == 1: incs += ' ' + env['BF_FFMPEG_INC'] if env['WITH_BF_VERSE']: - defs.append('WITH_VERSE') - incs += ' ' + env['BF_VERSE_INCLUDE'] + defs.append('WITH_VERSE') + incs += ' ' + env['BF_VERSE_INCLUDE'] # TODO buildinfo if env['BF_BUILDINFO'] == 1: diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index f5f19cbc09f..af203021898 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -1210,9 +1210,14 @@ static void render_panel_render(void) uiBlockBeginAlign(block); uiDefBut(block, BUT,B_DORENDER,"RENDER", 369, 164, 191,37, 0, 0, 0, 0, 0, "Start the rendering"); +#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 */ uiBlockBeginAlign(block); uiDefButBitI(block, TOG, R_OSA, 0, "OSA", 369,109,122,20,&G.scene->r.mode, 0, 0, 0, 0, "Enables Oversampling (Anti-aliasing)"); |