[Bf-blender-cvs] [26e5c28] GPU_data_request: init GL state tracking *after* clearing viewport

[Mike Erwin]

Commit: 26e5c28d399eb57696529dc96eb2bf439a7df0cb
Author: Mike Erwin
Date:   Mon Apr 13 16:11:38 2015 -0400
Branches: GPU_data_request
https://developer.blender.org/rB26e5c28d399eb57696529dc96eb2bf439a7df0cb

init GL state tracking *after* clearing viewport

Clear function doesn’t use state tracking, sets GL directly.

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

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 7e8dd80..75a6b81 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3718,8 +3718,6 @@ static void view3d_main_area_draw_viewport_new(const bContext *UNUSED(C), Scene
 	/* setup view matrices */
 	view3d_main_area_setup_view(scene, v3d, ar, NULL, NULL);
 
-	GPUx_reset_draw_state(); /* for code below which uses GPUx_state */
-
 	/* framebuffer fx needed, we need to draw offscreen first */
 	if (v3d->fx_settings.fx_flag) {
 		GPUFXSettings fx_settings;
@@ -3743,6 +3741,8 @@ static void view3d_main_area_draw_viewport_new(const bContext *UNUSED(C), Scene
 	/* clear the background */
 	view3d_main_area_clear(scene, v3d, ar);
 
+	GPUx_reset_draw_state(); /* for code below which uses GPUx_state */
+
 	drawfloor_new(scene, v3d, grid_unit);
 
 	/* yanked verbatim from view3d_draw_objects