Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define

8 files changed, 16 insertions, 16 deletions

diff --git a/source/blender/compositor/intern/COM_ExecutionSystemHelper.h b/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
index 002423c195c..ae9e75e0408 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
+++ b/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
@@ -92,7 +92,7 @@ public:
 	 * Find all Node Operations that needs to be executed.
 	 * @param rendering
 	 * the rendering parameter will tell what type of execution we are doing
-	 * FALSE is editing, TRUE is rendering
+	 * false is editing, true is rendering
 	 */
 	static void findOutputNodeOperations(vector<NodeOperation *> *result, vector<NodeOperation *>& operations, bool rendering);
 
diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp
index 1c1dcf1c37d..99655c67a3f 100644
--- a/source/blender/compositor/intern/COM_compositor.cpp
+++ b/source/blender/compositor/intern/COM_compositor.cpp
@@ -36,7 +36,7 @@ extern "C" {
 #include "COM_MovieDistortionOperation.h"
 
 static ThreadMutex s_compositorMutex;
-static bool is_compositorMutex_init = FALSE;
+static bool is_compositorMutex_init = false;
 
 static void intern_freeCompositorCaches()
 {
@@ -50,9 +50,9 @@ void COM_execute(RenderData *rd, Scene *scene, bNodeTree *editingtree, int rende
 	/* initialize mutex, TODO this mutex init is actually not thread safe and
 	 * should be done somewhere as part of blender startup, all the other
 	 * initializations can be done lazily */
-	if (is_compositorMutex_init == FALSE) {
+	if (is_compositorMutex_init == false) {
 		BLI_mutex_init(&s_compositorMutex);
-		is_compositorMutex_init = TRUE;
+		is_compositorMutex_init = true;
 	}
 
 	BLI_mutex_lock(&s_compositorMutex);
@@ -69,7 +69,7 @@ void COM_execute(RenderData *rd, Scene *scene, bNodeTree *editingtree, int rende
 	 * Reserved preview size is determined by render output for now.
 	 */
 	float aspect = rd->xsch > 0 ? (float)rd->ysch / (float)rd->xsch : 1.0f;
-	BKE_node_preview_init_tree(editingtree, COM_PREVIEW_SIZE, (int)(COM_PREVIEW_SIZE * aspect), FALSE);
+	BKE_node_preview_init_tree(editingtree, COM_PREVIEW_SIZE, (int)(COM_PREVIEW_SIZE * aspect), false);
 
 	/* initialize workscheduler, will check if already done. TODO deinitialize somewhere */
 	bool use_opencl = (editingtree->flag & NTREE_COM_OPENCL) != 0;
@@ -116,7 +116,7 @@ void COM_deinitialize()
 		BLI_mutex_lock(&s_compositorMutex);
 		intern_freeCompositorCaches();
 		WorkScheduler::deinitialize();
-		is_compositorMutex_init = FALSE;
+		is_compositorMutex_init = false;
 		BLI_mutex_unlock(&s_compositorMutex);
 		BLI_mutex_end(&s_compositorMutex);
 	}
diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
index f656b7f4892..99a7c5b64c4 100644
--- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
+++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
@@ -251,7 +251,7 @@ static void convolve(float *dst, MemoryBuffer *in1, MemoryBuffer *in2)
 	fRGB wt, *colp;
 	int x, y, ch;
 	int xbl, ybl, nxb, nyb, xbsz, ybsz;
-	int in2done = FALSE;
+	bool in2done = false;
 	const unsigned int kernelWidth = in2->getWidth();
 	const unsigned int kernelHeight = in2->getHeight();
 	const unsigned int imageWidth = in1->getWidth();
@@ -358,7 +358,7 @@ static void convolve(float *dst, MemoryBuffer *in1, MemoryBuffer *in2)
 				}
 
 			}
-			in2done = TRUE;
+			in2done = true;
 		}
 	}
 
diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp b/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
index 0a1587c6ffa..17b85847fcf 100644
--- a/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
+++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
@@ -148,7 +148,7 @@ KeyingScreenOperation::TriangulationData *KeyingScreenOperation::buildVoronoiTri
 			continue;
 		}
 
-		pattern_ibuf = BKE_tracking_get_pattern_imbuf(ibuf, track, marker, TRUE, FALSE);
+		pattern_ibuf = BKE_tracking_get_pattern_imbuf(ibuf, track, marker, true, false);
 
 		zero_v3(site->color);
 
diff --git a/source/blender/compositor/operations/COM_MapRangeOperation.cpp b/source/blender/compositor/operations/COM_MapRangeOperation.cpp
index 2e80d4f1ba3..7a89ba91b4c 100644
--- a/source/blender/compositor/operations/COM_MapRangeOperation.cpp
+++ b/source/blender/compositor/operations/COM_MapRangeOperation.cpp
@@ -31,7 +31,7 @@ MapRangeOperation::MapRangeOperation() : NodeOperation()
 	this->addInputSocket(COM_DT_VALUE);
 	this->addOutputSocket(COM_DT_VALUE);
 	this->m_inputOperation = NULL;
-	this->m_useClamp = FALSE;
+	this->m_useClamp = false;
 }
 
 void MapRangeOperation::initExecution()
diff --git a/source/blender/compositor/operations/COM_MaskOperation.cpp b/source/blender/compositor/operations/COM_MaskOperation.cpp
index 7ee2c111932..112b5912ad3 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_MaskOperation.cpp
@@ -54,7 +54,7 @@ void MaskOperation::initExecution()
 
 			BKE_maskrasterize_handle_init(this->m_rasterMaskHandles[0], this->m_mask,
 			        this->m_maskWidth, this->m_maskHeight,
-			        TRUE, this->m_do_smooth, this->m_do_feather);
+			        true, this->m_do_smooth, this->m_do_feather);
 		}
 		else {
 			/* make a throw away copy of the mask */
@@ -88,7 +88,7 @@ void MaskOperation::initExecution()
 
 				BKE_maskrasterize_handle_init(this->m_rasterMaskHandles[i], mask_temp,
 				                              this->m_maskWidth, this->m_maskHeight,
-				                              TRUE, this->m_do_smooth, this->m_do_feather);
+				                              true, this->m_do_smooth, this->m_do_feather);
 
 				frame_iter += frame_step;
 			}
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
index 094b2c4268a..75b36d7672a 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
@@ -141,8 +141,8 @@ void OutputSingleLayerOperation::deinitExecution()
 		IMB_colormanagement_imbuf_for_write(ibuf, true, false, m_viewSettings, m_displaySettings,
 		                                    this->m_format);
 
-		BKE_makepicstring(filename, this->m_path, bmain->name, this->m_rd->cfra, this->m_format,
-		                  (this->m_rd->scemode & R_EXTENSION), true);
+		BKE_makepicstring(filename, this->m_path, bmain->name, this->m_rd->cfra,
+		                  this->m_format, (this->m_rd->scemode & R_EXTENSION) != 0, true);
 		
 		if (0 == BKE_imbuf_write(ibuf, filename, this->m_format))
 			printf("Cannot save Node File Output to %s\n", filename);
@@ -212,7 +212,7 @@ void OutputOpenExrMultiLayerOperation::deinitExecution()
 		void *exrhandle = IMB_exr_get_handle();
 		
 		BKE_makepicstring_from_type(filename, this->m_path, bmain->name, this->m_rd->cfra, R_IMF_IMTYPE_MULTILAYER,
-		                  (this->m_rd->scemode & R_EXTENSION), true);
+		                            (this->m_rd->scemode & R_EXTENSION) != 0, true);
 		BLI_make_existing_file(filename);
 		
 		for (unsigned int i = 0; i < this->m_layers.size(); ++i) {
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cpp b/source/blender/compositor/operations/COM_PreviewOperation.cpp
index 2ea18f64aab..85c7f449fd5 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.cpp
+++ b/source/blender/compositor/operations/COM_PreviewOperation.cpp
@@ -56,7 +56,7 @@ void PreviewOperation::verifyPreview(bNodeInstanceHash *previews, bNodeInstanceK
 	/* Size (0, 0) ensures the preview rect is not allocated in advance,
 	 * this is set later in initExecution once the resolution is determined.
 	 */
-	this->m_preview = BKE_node_preview_verify(previews, key, 0, 0, TRUE);
+	this->m_preview = BKE_node_preview_verify(previews, key, 0, 0, true);
 }
 
 void PreviewOperation::initExecution()