diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-23 20:49:29 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-23 20:49:29 +0300 |
| commit | 2081fd1d7de40f7b3e1a529f5b450ed508fe9257 (patch) | |
| tree | 4e468d5d567aba01ed6015efcd0df7144bb6fbe2 /source/blender/editors | |
| parent | 67fcf5256d81ce7e80ab1f4c75fb81b43e634301 (diff) | |
Gooseberry request:
Show World will now influence if world is rendered in opengl rendering.
This is a little undefined according to blender history, since sky used
to always be drawn when offscreen rendering, as if "Only Render" was
ticked. Since if we don't draw sky in that case there's no valid color
really (and using theme colors is not so nice) we just draw transparent
background.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index dab4b6a941c..ab237e78c26 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1528,7 +1528,7 @@ void UI_ThemeClearColor(int colorid) float col[3]; UI_GetThemeColor3fv(colorid, col); - glClearColor(col[0], col[1], col[2], 0.0); + glClearColor(col[0], col[1], col[2], 0.0f); } int UI_ThemeMenuShadowWidth(void) diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 402e72db217..d5cf7dd755a 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -136,7 +136,7 @@ static void screen_opengl_render_apply(OGLRender *oglrender) int sizey = oglrender->sizey; const short view_context = (v3d != NULL); bool draw_bgpic = true; - bool draw_sky = (scene->r.alphamode == R_ADDSKY); + bool draw_sky = (scene->r.alphamode == R_ADDSKY) && v3d && (v3d->flag3 & V3D_SHOW_WORLD); unsigned char *rect = NULL; rr = RE_AcquireResultRead(oglrender->re); diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 0878f2b7aa7..8e516e1ea0e 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -3175,7 +3175,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(Scene *scene, View3D *v3d, ARegion *ar, in RegionView3D *rv3d = ar->regiondata; ImBuf *ibuf; GPUOffScreen *ofs; - bool draw_sky = (alpha_mode == R_ADDSKY); + bool draw_sky = (alpha_mode == R_ADDSKY) && v3d && (v3d->flag3 & V3D_SHOW_WORLD); /* state changes make normal drawing go weird otherwise */ glPushAttrib(GL_LIGHTING_BIT); |