diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-13 17:29:06 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-13 17:29:06 +0300 |
| commit | ffa0fd2f2e8e45445aa4dc9c6447256ab6fbcaaa (patch) | |
| tree | 554b9019d83841e2c12e9d8a2be40848a4fdd148 /source/blender/src/buttons_scene.c | |
| parent | bc9848f7e67c3e695403179f8bcdb78b0e5764a3 (diff) | |
- Fix for bug #8264: SSS turned off by "default" render settings button,
I also added a button to control enabling/disabling SSS for render.
- Fix for potential halo sorting crash.
- Add a newline at the end of a file to remove gcc warning.
Diffstat (limited to 'source/blender/src/buttons_scene.c')
| -rw-r--r-- | source/blender/src/buttons_scene.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index f11f97dffdf..99b4ddb4623 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -1574,7 +1574,7 @@ void do_render_panels(unsigned short event) G.scene->r.xasp= 54; G.scene->r.yasp= 51; G.scene->r.size= 100; - G.scene->r.mode= R_OSA+R_SHADOW+R_FIELDS; + G.scene->r.mode= R_OSA+R_SHADOW+R_FIELDS+R_SSS; G.scene->r.imtype= R_TARGA; G.scene->r.xparts= G.scene->r.yparts= 4; @@ -2174,11 +2174,12 @@ static void render_panel_render(void) uiDefButS(block, MENU, B_DIFF,"Octree resolution %t|64 %x64|128 %x128|256 %x256|512 %x512", 496,13,64,20,&G.scene->r.ocres,0.0,0.0, 0, 0, "Octree resolution for ray tracing"); uiBlockBeginAlign(block); - uiDefButBitI(block, TOG, R_SHADOW, B_REDR,"Shadow", 565,172,60,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable shadow calculation"); - uiDefButBitI(block, TOG, R_ENVMAP, B_REDR,"EnvMap", 627,172,60,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable environment map rendering"); - uiDefButBitI(block, TOG, R_PANORAMA, B_REDR,"Pano", 565,142,40,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable panorama rendering (output width is multiplied by Xparts)"); - uiDefButBitI(block, TOG, R_RAYTRACE, B_REDR,"Ray",606,142,40,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable ray tracing"); - uiDefButBitI(block, TOG, R_RADIO, B_REDR,"Radio", 647,142,40,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable radiosity rendering"); + uiDefButBitI(block, TOG, R_SHADOW, B_REDR,"Shadow", 565,172,52,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable shadow calculation"); + uiDefButBitI(block, TOG, R_SSS, B_REDR,"SSS", 617,172,32,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable subsurface scattering map rendering"); + uiDefButBitI(block, TOG, R_PANORAMA, B_REDR,"Pano", 649,172,38,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable panorama rendering (output width is multiplied by Xparts)"); + uiDefButBitI(block, TOG, R_ENVMAP, B_REDR,"EnvMap", 565,142,52,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable environment map rendering"); + uiDefButBitI(block, TOG, R_RAYTRACE, B_REDR,"Ray",617,142,32,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable ray tracing"); + uiDefButBitI(block, TOG, R_RADIO, B_REDR,"Radio", 649,142,38,29, &G.scene->r.mode, 0, 0, 0, 0, "Enable radiosity rendering"); uiBlockEndAlign(block); uiBlockBeginAlign(block); |