Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define

7 files changed, 14 insertions, 13 deletions

diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.c b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
index 952ec15f2aa..76101409ba7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_outputFile.c
+++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
@@ -129,7 +129,7 @@ bNodeSocket *ntreeCompositOutputFileAddSocket(bNodeTree *ntree, bNode *node, con
 	else
 		BKE_imformat_defaults(&sockdata->format);
 	/* use node data format by default */
-	sockdata->use_node_format = TRUE;
+	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 0ed6530cbaa..af9108b2559 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -94,10 +94,10 @@ int node_group_poll_instance(bNode *node, bNodeTree *nodetree)
 		if (grouptree)
 			return nodeGroupPoll(nodetree, grouptree);
 		else
-			return TRUE;    /* without a linked node tree, group node is always ok */
+			return true;    /* without a linked node tree, group node is always ok */
 	}
 	else
-		return FALSE;
+		return false;
 }
 
 int nodeGroupPoll(bNodeTree *nodetree, bNodeTree *grouptree)
diff --git a/source/blender/nodes/intern/node_exec.c b/source/blender/nodes/intern/node_exec.c
index 37018b3a98d..2ae2da6d6b4 100644
--- a/source/blender/nodes/intern/node_exec.c
+++ b/source/blender/nodes/intern/node_exec.c
@@ -265,7 +265,7 @@ bNodeThreadStack *ntreeGetThreadStack(bNodeTreeExec *exec, int thread)
 	
 	for (nts = lb->first; nts; nts = nts->next) {
 		if (!nts->used) {
-			nts->used = TRUE;
+			nts->used = true;
 			break;
 		}
 	}
@@ -273,7 +273,7 @@ bNodeThreadStack *ntreeGetThreadStack(bNodeTreeExec *exec, int thread)
 	if (!nts) {
 		nts = MEM_callocN(sizeof(bNodeThreadStack), "bNodeThreadStack");
 		nts->stack = MEM_dupallocN(exec->stack);
-		nts->used = TRUE;
+		nts->used = true;
 		BLI_addtail(lb, nts);
 	}
 
diff --git a/source/blender/nodes/intern/node_exec.h b/source/blender/nodes/intern/node_exec.h
index 4101c6c4c4d..a0023d02295 100644
--- a/source/blender/nodes/intern/node_exec.h
+++ b/source/blender/nodes/intern/node_exec.h
@@ -72,7 +72,7 @@ typedef struct bNodeTreeExec {
 typedef struct bNodeThreadStack {
 	struct bNodeThreadStack *next, *prev;
 	struct bNodeStack *stack;
-	int used;
+	bool used;
 } bNodeThreadStack;
 
 int node_exec_socket_use_stack(struct bNodeSocket *sock);
diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c
index 8e83140733a..e40d1d1a9c7 100644
--- a/source/blender/nodes/shader/node_shader_util.c
+++ b/source/blender/nodes/shader/node_shader_util.c
@@ -228,22 +228,23 @@ void ntreeExecGPUNodes(bNodeTreeExec *exec, GPUMaterial *mat, int do_outputs, sh
 	bNodeStack *nsin[MAX_SOCKET];   /* arbitrary... watch this */
 	bNodeStack *nsout[MAX_SOCKET];  /* arbitrary... watch this */
 	GPUNodeStack gpuin[MAX_SOCKET + 1], gpuout[MAX_SOCKET + 1];
-	int do_it;
+	bool do_it;
 
 	stack = exec->stack;
 
 	for (n = 0, nodeexec = exec->nodeexec; n < exec->totnodes; ++n, ++nodeexec) {
 		node = nodeexec->node;
 		
-		do_it = FALSE;
+		do_it = false;
 		/* for groups, only execute outputs for edited group */
 		if (node->typeinfo->nclass == NODE_CLASS_OUTPUT) {
 			if (node->typeinfo->compatibility & compatibility)
 				if (do_outputs && (node->flag & NODE_DO_OUTPUT))
-					do_it = TRUE;
+					do_it = true;
+		}
+		else {
+			do_it = true;
 		}
-		else
-			do_it = TRUE;
 
 		if (do_it) {
 			if (node->typeinfo->gpufunc) {
diff --git a/source/blender/nodes/shader/nodes/node_shader_texture.c b/source/blender/nodes/shader/nodes/node_shader_texture.c
index 6f4e56c76a4..4e5d2e712dc 100644
--- a/source/blender/nodes/shader/nodes/node_shader_texture.c
+++ b/source/blender/nodes/shader/nodes/node_shader_texture.c
@@ -125,7 +125,7 @@ static int gpu_shader_texture(GPUMaterial *mat, bNode *node, bNodeExecData *UNUS
 	Tex *tex = (Tex *)node->id;
 
 	if (tex && tex->type == TEX_IMAGE && tex->ima) {
-		GPUNodeLink *texlink = GPU_image(tex->ima, &tex->iuser, FALSE);
+		GPUNodeLink *texlink = GPU_image(tex->ima, &tex->iuser, false);
 		int ret = GPU_stack_link(mat, "texture_image", in, out, texlink);
 
 		if (ret) {
diff --git a/source/blender/nodes/texture/nodes/node_texture_output.c b/source/blender/nodes/texture/nodes/node_texture_output.c
index f93c020b38b..a0d54cdae4e 100644
--- a/source/blender/nodes/texture/nodes/node_texture_output.c
+++ b/source/blender/nodes/texture/nodes/node_texture_output.c
@@ -65,7 +65,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 			tex_input_rgba(&target->tr, in[0], &params, cdata->thread);
 		
 			target->tin = (target->tr + target->tg + target->tb) / 3.0f;
-			target->talpha = TRUE;
+			target->talpha = true;
 		
 			if (target->nor) {
 				if (in[1] && in[1]->hasinput)