Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-02-23 20:49:29 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-02-23 20:49:29 +0300
commit2081fd1d7de40f7b3e1a529f5b450ed508fe9257 (patch)
tree4e468d5d567aba01ed6015efcd0df7144bb6fbe2 /source/blender/editors/space_view3d
parent67fcf5256d81ce7e80ab1f4c75fb81b43e634301 (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/space_view3d')
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c2
1 files changed, 1 insertions, 1 deletions
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);