[Bf-blender-cvs] [998a8043581] blender2.8: DRW: Don't highjack all debug values (cont)

Clément Foucault noreply at git.blender.org
Tue Sep 11 16:35:00 CEST 2018


Commit: 998a80435819387ce88d922d7fd7049e8e27b7bf
Author: Clément Foucault
Date:   Tue Sep 11 16:34:52 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB998a80435819387ce88d922d7fd7049e8e27b7bf

DRW: Don't highjack all debug values (cont)

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

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

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index c6eeda45d40..b5729d2ef55 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1570,7 +1570,7 @@ void DRW_draw_render_loop_ex(
 		ED_view3d_draw_bgpic_test(scene, depsgraph, ar, v3d, true, true);
 	}
 
-	if (G.debug_value > 20) {
+	if (G.debug_value > 20 && G.debug_value < 30) {
 		glDisable(GL_DEPTH_TEST);
 		rcti rect; /* local coordinate visible rect inside region, to accomodate overlapping ui */
 		ED_region_visible_rect(DST.draw_ctx.ar, &rect);
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 26507a83553..592bb2b8dec 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -1012,7 +1012,9 @@ DRWPass *DRW_pass_create(const char *name, DRWState state)
 {
 	DRWPass *pass = BLI_mempool_alloc(DST.vmempool->passes);
 	pass->state = state;
-	if ((G.debug_value > 20) || (G.debug & G_DEBUG)) {
+	if (((G.debug_value > 20) && (G.debug_value < 30)) ||
+	     (G.debug & G_DEBUG))
+	{
 		BLI_strncpy(pass->name, name, MAX_PASS_NAME);
 	}



More information about the Bf-blender-cvs mailing list