From af3e348430218e609c80d86c8dd418bed15e70e8 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 19 May 2012 13:28:19 +0000
Subject: code cleanup: use TRUE/FALSE rather then 1/0 for better readability,
 also replace do prefix with do_ for bool vars.

---
 source/blender/nodes/composite/node_composite_util.c           |  4 ++--
 source/blender/nodes/composite/nodes/node_composite_defocus.c  |  2 +-
 .../blender/nodes/composite/nodes/node_composite_outputFile.c  |  2 +-
 source/blender/nodes/intern/node_common.c                      |  2 +-
 source/blender/nodes/intern/node_exec.c                        |  4 ++--
 source/blender/nodes/shader/node_shader_util.c                 | 10 +++++-----
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'source/blender/nodes')

diff --git a/source/blender/nodes/composite/node_composite_util.c b/source/blender/nodes/composite/node_composite_util.c
index f26b5f44f99..0d1840a7a7d 100644
--- a/source/blender/nodes/composite/node_composite_util.c
+++ b/source/blender/nodes/composite/node_composite_util.c
@@ -986,7 +986,7 @@ void convolve(CompBuf* dst, CompBuf* in1, CompBuf* in2)
 	fRGB wt, *colp;
 	int x, y, ch;
 	int xbl, ybl, nxb, nyb, xbsz, ybsz;
-	int in2done = 0;
+	int in2done = FALSE;
 
 	CompBuf* rdst = alloc_compbuf(in1->x, in1->y, in1->type, 1);
 
@@ -1086,7 +1086,7 @@ void convolve(CompBuf* dst, CompBuf* in1, CompBuf* in2)
 				}
 
 			}
-			in2done = 1;
+			in2done = TRUE;
 		}
 	}
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.c b/source/blender/nodes/composite/nodes/node_composite_defocus.c
index 72dec01066e..84b203d005a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_defocus.c
+++ b/source/blender/nodes/composite/nodes/node_composite_defocus.c
@@ -249,7 +249,7 @@ static void defocus_blur(bNode *node, CompBuf *new, CompBuf *img, CompBuf *zbuf,
 	float bkh_b[4] = {0};	// shape 2D bound
 	float cam_fdist=1, cam_invfdist=1, cam_lens=35;
 	float dof_sp, maxfgc, bk_hn_theta=0, inradsq=0;
-	int y, len_bkh=0, ydone=0;
+	int y, len_bkh=0, ydone = FALSE;
 	float aspect, aperture;
 	int minsz;
 	//float bcrad, nmaxc, scf;
diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.c b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
index a571b140a1f..fcc8ed4a128 100644
--- a/source/blender/nodes/composite/nodes/node_composite_outputFile.c
+++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
@@ -124,7 +124,7 @@ bNodeSocket *ntreeCompositOutputFileAddSocket(bNodeTree *ntree, bNode *node, con
 		}
 	}
 	/* use node data format by default */
-	sockdata->use_node_format = 1;
+	sockdata->use_node_format = TRUE;
 	
 	nimf->active_input = BLI_findindex(&node->inputs, sock);
 	
diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index 49a3d6c07b4..300954a3c19 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -133,7 +133,7 @@ bNode *node_group_make_from_selected(bNodeTree *ntree)
 			DO_MINMAX2((&node->locx), min, max);
 			totnode++;
 		}
-		node->done= 0;
+		node->done = FALSE;
 	}
 	if (totnode==0) return NULL;
 	
diff --git a/source/blender/nodes/intern/node_exec.c b/source/blender/nodes/intern/node_exec.c
index 3b757e753a4..3f77638e25a 100644
--- a/source/blender/nodes/intern/node_exec.c
+++ b/source/blender/nodes/intern/node_exec.c
@@ -242,7 +242,7 @@ bNodeThreadStack *ntreeGetThreadStack(bNodeTreeExec *exec, int thread)
 	
 	for (nts=lb->first; nts; nts=nts->next) {
 		if (!nts->used) {
-			nts->used= 1;
+			nts->used = TRUE;
 			break;
 		}
 	}
@@ -250,7 +250,7 @@ bNodeThreadStack *ntreeGetThreadStack(bNodeTreeExec *exec, int thread)
 	if (!nts) {
 		nts= MEM_callocN(sizeof(bNodeThreadStack), "bNodeThreadStack");
 		nts->stack= MEM_dupallocN(exec->stack);
-		nts->used= 1;
+		nts->used = TRUE;
 		BLI_addtail(lb, nts);
 	}
 
diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c
index 9a9a27603dc..5961c2b330b 100644
--- a/source/blender/nodes/shader/node_shader_util.c
+++ b/source/blender/nodes/shader/node_shader_util.c
@@ -277,23 +277,23 @@ void ntreeExecGPUNodes(bNodeTreeExec *exec, GPUMaterial *mat, int do_outputs)
 	bNodeStack *nsin[MAX_SOCKET];	/* arbitrary... watch this */
 	bNodeStack *nsout[MAX_SOCKET];	/* arbitrary... watch this */
 	GPUNodeStack gpuin[MAX_SOCKET+1], gpuout[MAX_SOCKET+1];
-	int doit;
+	int do_it;
 
 	stack= exec->stack;
 
 	for (n=0, nodeexec= exec->nodeexec; n < exec->totnodes; ++n, ++nodeexec) {
 		node = nodeexec->node;
 		
-		doit = 0;
+		do_it = FALSE;
 		/* for groups, only execute outputs for edited group */
 		if (node->typeinfo->nclass==NODE_CLASS_OUTPUT) {
 			if (do_outputs && (node->flag & NODE_DO_OUTPUT))
-				doit = 1;
+				do_it = TRUE;
 		}
 		else
-			doit = 1;
+			do_it = TRUE;
 
-		if (doit) {
+		if (do_it) {
 			if (node->typeinfo->gpufunc) {
 				node_get_stack(node, stack, nsin, nsout);
 				gpu_stack_from_data_list(gpuin, &node->inputs, nsin);
-- 
cgit v1.2.3