[Bf-blender-cvs] [d62dde9a731] greasepencil-object: Cleanup: Change debug code

Antonio Vazquez noreply at git.blender.org
Sat Oct 14 11:25:55 CEST 2017


Commit: d62dde9a7313bc9cc55bb4776aa9e2f45d8f6dc6
Author: Antonio Vazquez
Date:   Sat Oct 14 11:24:29 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd62dde9a7313bc9cc55bb4776aa9e2f45d8f6dc6

Cleanup: Change debug code

No functional changes.

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

M	source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M	source/blender/draw/engines/gpencil/gpencil_engine.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index 52a9c187fea..29ce7f0b274 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -175,7 +175,7 @@ static void gpencil_batch_cache_init(Object *ob, int cfra)
 	GpencilBatchCache *cache = gpencil_batch_get_element(ob);
 	bGPdata *gpd = ob->gpd;
 
-	if (G.debug_value == 668) {
+	if (G.debug_value >= 664) {
 		printf("gpencil_batch_cache_init: %s\n", ob->id.name);
 	}
 
@@ -212,7 +212,7 @@ static void gpencil_batch_cache_clear(GpencilBatchCache *cache, bGPdata *gpd)
 		return;
 	}
 
-	if (G.debug_value == 668) {
+	if (G.debug_value >= 664) {
 		printf("gpencil_batch_cache_clear: %s\n", gpd->id.name);
 	}
 
@@ -238,6 +238,10 @@ static GpencilBatchCache *gpencil_batch_cache_get(Object *ob, int cfra)
 	bGPdata *gpd = ob->gpd;
 
 	if (!gpencil_batch_cache_valid(ob, gpd, cfra)) {
+		if (G.debug_value >= 664) {
+			printf("gpencil_batch_cache: %s\n", gpd->id.name);
+		}
+
 		GpencilBatchCache *cache = gpencil_batch_get_element(ob);
 		if (cache) {
 			gpencil_batch_cache_clear(cache, gpd);
@@ -1071,7 +1075,7 @@ void DRW_gpencil_populate_datablock(GPENCIL_e_data *e_data, void *vedata, Scene
 	bGPDframe *derived_gpf = NULL;
 	bool no_onion = (bool)(gpd->flag & GP_DATA_STROKE_WEIGHTMODE);
 
-	if (G.debug_value == 668) {
+	if (G.debug_value == 665) {
 		printf("DRW_gpencil_populate_datablock: %s\n", gpd->id.name);
 	}
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index dcfeb85a83d..4a3b3977a33 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -178,7 +178,7 @@ static void GPENCIL_engine_free(void)
 
 static void GPENCIL_cache_init(void *vedata)
 {
-	if (G.debug_value == 668) {
+	if (G.debug_value == 665) {
 		printf("GPENCIL_cache_init\n");
 	}
 
@@ -391,7 +391,7 @@ static void GPENCIL_cache_populate(void *vedata, Object *ob)
 	/* object datablock (this is not draw now) */
 	if (ob->type == OB_GPENCIL && ob->gpd) {
 		if ((stl->g_data->session_flag & GP_DRW_PAINT_READY) == 0) {
-			if (G.debug_value == 668) {
+			if (G.debug_value == 665) {
 				printf("GPENCIL_cache_populate: %s\n", ob->id.name);
 			}
 			/* allocate memory for saving gp objects */
@@ -441,7 +441,7 @@ static void GPENCIL_cache_finish(void *vedata)
 
 			/* save end shading group */
 			stl->g_data->gp_object_cache[i].end_grp = stl->storage->shgroup_id - 1;
-			if (G.debug_value == 668) {
+			if (G.debug_value == 665) {
 				printf("GPENCIL_cache_finish: %s %d->%d\n", ob->id.name, 
 					stl->g_data->gp_object_cache[i].init_grp, stl->g_data->gp_object_cache[i].end_grp);
 			}
@@ -664,7 +664,7 @@ static void GPENCIL_draw_scene(void *vedata)
 				/* Stroke Pass: DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND | DRW_STATE_WRITE_DEPTH
 				 * draw only a subset that usually start with a fill and end with stroke because the
 				 * shading groups are created by pairs */
-				if (G.debug_value == 668) {
+				if (G.debug_value == 665) {
 					printf("GPENCIL_draw_scene: %s %d->%d\n", ob->id.name, init_grp, end_grp);
 				}



More information about the Bf-blender-cvs mailing list