[Bf-blender-cvs] [fffb185dbff] master: DRW: Fix debug drawcalls and annotation drawing

[Clément Foucault]

Commit: fffb185dbffa3d1bd6a1424fc594d3f2e6fa8331
Author: Clément Foucault
Date:   Wed Feb 12 16:52:45 2020 +0100
Branches: master
https://developer.blender.org/rBfffb185dbffa3d1bd6a1424fc594d3f2e6fa8331

DRW: Fix debug drawcalls and annotation drawing

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 6ff0da8705c..2092be254fa 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1309,6 +1309,9 @@ void DRW_draw_callbacks_post_scene(void)
      * function is done with sRGB color. Avoid double transform. */
     glDisable(GL_FRAMEBUFFER_SRGB);
 
+    GPU_matrix_projection_set(rv3d->winmat);
+    GPU_matrix_set(rv3d->viewmat);
+
     /* annotations - temporary drawing buffer (3d space) */
     /* XXX: Or should we use a proper draw/overlay engine for this case? */
     if (do_annotations) {
@@ -1320,9 +1323,6 @@ void DRW_draw_callbacks_post_scene(void)
 
     drw_debug_draw();
 
-    GPU_matrix_projection_set(rv3d->winmat);
-    GPU_matrix_set(rv3d->viewmat);
-
     GPU_depth_test(false);
     ED_region_draw_cb_draw(DST.draw_ctx.evil_C, DST.draw_ctx.ar, REGION_DRAW_POST_VIEW);