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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2014-05-19 16:18:02 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-05-19 16:25:08 +0400
commit5f05ebc2d9775581e7853c80ecd28033e5f0ae60 (patch)
tree31032984fcf28a2d18510acae9224e88e658e440 /source/blender
parent0f4018a8e5bd5c0a66176388eef822805d8ae8fb (diff)
Fix T40242: 3D view background images incorrectly shown during viewport render.
Now they are shown when they are also visible in other draw modes.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 9ce6bf58a0a..d7a4ae4942b 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3106,7 +3106,7 @@ static bool view3d_main_area_draw_engine(const bContext *C, Scene *scene,
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
if (v3d->flag & V3D_DISPBGPICS)
- view3d_draw_bgpic(scene, ar, v3d, false, true);
+ view3d_draw_bgpic_test(scene, ar, v3d, false, true);
else
fdrawcheckerboard(0, 0, ar->winx, ar->winy);
@@ -3115,7 +3115,7 @@ static bool view3d_main_area_draw_engine(const bContext *C, Scene *scene,
type->view_draw(rv3d->render_engine, C);
if (v3d->flag & V3D_DISPBGPICS)
- view3d_draw_bgpic(scene, ar, v3d, true, true);
+ view3d_draw_bgpic_test(scene, ar, v3d, true, true);
if (clip_border) {
/* restore scissor as it was before */