[Bf-blender-cvs] [5f05ebc] master: Fix T40242: 3D view background images incorrectly shown during viewport render.

[Brecht Van Lommel]

Commit: 5f05ebc2d9775581e7853c80ecd28033e5f0ae60
Author: Brecht Van Lommel
Date:   Mon May 19 14:18:02 2014 +0200
https://developer.blender.org/rB5f05ebc2d9775581e7853c80ecd28033e5f0ae60

Fix T40242: 3D view background images incorrectly shown during viewport render.

Now they are shown when they are also visible in other draw modes.

===================================================================

M	source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 9ce6bf5..d7a4ae4 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 */