[Bf-blender-cvs] [60c6a74ce1d] blender-v2.82-release: Fix T72152 DRW_debug_sphere Not Working After Overlay Refactor

[Clément Foucault]

Commit: 60c6a74ce1d3664130848d7b278d0fd1a45037be
Author: Clément Foucault
Date:   Mon Jan 13 17:40:55 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB60c6a74ce1d3664130848d7b278d0fd1a45037be

Fix T72152 DRW_debug_sphere Not Working After Overlay Refactor

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

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

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

diff --git a/source/blender/draw/intern/draw_debug.c b/source/blender/draw/intern/draw_debug.c
index 6b05bb07c0f..59c6efe1a61 100644
--- a/source/blender/draw/intern/draw_debug.c
+++ b/source/blender/draw/intern/draw_debug.c
@@ -210,6 +210,10 @@ static void drw_debug_draw_spheres(void)
   GPU_batch_instbuf_set(draw_batch, inst_vbo, true);
   GPU_batch_program_set_builtin(draw_batch, GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE);
 
+  float persmat[4][4];
+  DRW_view_persmat_get(NULL, persmat, false);
+  GPU_batch_uniform_mat4(draw_batch, "ViewProjectionMatrix", persmat);
+
   GPU_batch_draw(draw_batch);
   GPU_batch_discard(draw_batch);
 }
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index b747222e387..3174edb0c05 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1606,6 +1606,8 @@ void DRW_draw_render_loop_ex(struct Depsgraph *depsgraph,
     drw_draw_background_alpha_under();
   }
 
+  drw_debug_draw();
+
   /* Fix 3D view being "laggy" on macos and win+nvidia. (See T56996, T61474) */
   GPU_flush();
 
@@ -1630,8 +1632,6 @@ void DRW_draw_render_loop_ex(struct Depsgraph *depsgraph,
     DRW_state_reset();
   }
 
-  drw_debug_draw();
-
   GPU_depth_test(false);
   drw_engines_draw_text();
   GPU_depth_test(true);