code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.

6 files changed, 27 insertions, 26 deletions

diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index 2b83a55d7bb..a8c94865aa5 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -130,7 +130,7 @@ static void wm_region_test_render_do_draw(ScrArea *sa, ARegion *ar)
 		RenderEngine *engine = (rv3d) ? rv3d->render_engine : NULL;
 
 		if (engine && (engine->flag & RE_ENGINE_DO_DRAW)) {
-			ar->do_draw = 1;
+			ar->do_draw = TRUE;
 			engine->flag &= ~RE_ENGINE_DO_DRAW;
 		}
 	}
@@ -661,15 +661,15 @@ static int wm_draw_update_test_window(wmWindow *win)
 {
 	ScrArea *sa;
 	ARegion *ar;
-	int do_draw = 0;
+	int do_draw = FALSE;
 
 	for (ar = win->screen->regionbase.first; ar; ar = ar->next) {
 		if (ar->do_draw_overlay) {
 			wm_tag_redraw_overlay(win, ar);
-			ar->do_draw_overlay = 0;
+			ar->do_draw_overlay = FALSE;
 		}
 		if (ar->swinid && ar->do_draw)
-			do_draw = 1;
+			do_draw = TRUE;
 	}
 
 	for (sa = win->screen->areabase.first; sa; sa = sa->next) {
@@ -677,7 +677,7 @@ static int wm_draw_update_test_window(wmWindow *win)
 			wm_region_test_render_do_draw(sa, ar);
 
 			if (ar->swinid && ar->do_draw)
-				do_draw = 1;
+				do_draw = TRUE;
 		}
 	}
 
@@ -737,7 +737,7 @@ void wm_tag_redraw_overlay(wmWindow *win, ARegion *ar)
 	if (ar && win) {
 		if (wm_automatic_draw_method(win) != USER_DRAW_TRIPLE)
 			ED_region_tag_redraw(ar);
-		win->screen->do_draw_paintcursor = 1;
+		win->screen->do_draw_paintcursor = TRUE;
 	}
 }
 
@@ -778,9 +778,9 @@ void wm_draw_update(bContext *C)
 			else // if (drawmethod == USER_DRAW_TRIPLE)
 				wm_method_draw_triple(C, win);
 
-			win->screen->do_draw_gesture = 0;
-			win->screen->do_draw_paintcursor = 0;
-			win->screen->do_draw_drag = 0;
+			win->screen->do_draw_gesture = FALSE;
+			win->screen->do_draw_paintcursor = FALSE;
+			win->screen->do_draw_drag = FALSE;
 		
 			wm_window_swap_buffers(win);
 
@@ -816,7 +816,7 @@ void wm_draw_region_clear(wmWindow *win, ARegion *ar)
 	if (ELEM(drawmethod, USER_DRAW_OVERLAP, USER_DRAW_OVERLAP_FLIP))
 		wm_flush_regions_down(win->screen, &ar->winrct);
 
-	win->screen->do_draw = 1;
+	win->screen->do_draw = TRUE;
 }
 
 void WM_redraw_windows(bContext *C)
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index fd3e287a6a5..556ca6b5995 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -194,7 +194,7 @@ void wm_event_do_notifiers(bContext *C)
 	
 	/* cache & catch WM level notifiers, such as frame change, scene/screen set */
 	for (win = wm->windows.first; win; win = win->next) {
-		int do_anim = 0;
+		int do_anim = FALSE;
 		
 		CTX_wm_window_set(C, win);
 		
@@ -229,7 +229,7 @@ void wm_event_do_notifiers(bContext *C)
 			{
 				if (note->category == NC_SCENE) {
 					if (note->data == ND_FRAME)
-						do_anim = 1;
+						do_anim = TRUE;
 				}
 			}
 			if (ELEM5(note->category, NC_SCENE, NC_OBJECT, NC_GEOM, NC_SCENE, NC_WM)) {
@@ -331,17 +331,17 @@ static int wm_handler_ui_call(bContext *C, wmEventHandler *handler, wmEvent *eve
 	ScrArea *area = CTX_wm_area(C);
 	ARegion *region = CTX_wm_region(C);
 	ARegion *menu = CTX_wm_menu(C);
-	static int do_wheel_ui = 1;
+	static int do_wheel_ui = TRUE;
 	int is_wheel = ELEM(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE);
 	int retval;
 	
 	/* UI is quite aggressive with swallowing events, like scrollwheel */
 	/* I realize this is not extremely nice code... when UI gets keymaps it can be maybe smarter */
-	if (do_wheel_ui == 0) {
+	if (do_wheel_ui == FALSE) {
 		if (is_wheel)
 			return WM_HANDLER_CONTINUE;
 		else if (wm_event_always_pass(event) == 0)
-			do_wheel_ui = 1;
+			do_wheel_ui = TRUE;
 	}
 	
 	/* we set context to where ui handler came from */
@@ -369,7 +369,7 @@ static int wm_handler_ui_call(bContext *C, wmEventHandler *handler, wmEvent *eve
 	
 	/* event not handled in UI, if wheel then we temporarily disable it */
 	if (is_wheel)
-		do_wheel_ui = 0;
+		do_wheel_ui = FALSE;
 	
 	return WM_HANDLER_CONTINUE;
 }
@@ -1863,7 +1863,7 @@ static void wm_paintcursor_tag(bContext *C, wmPaintCursor *pc, ARegion *ar)
 		for (; pc; pc = pc->next) {
 			if (pc->poll == NULL || pc->poll(C)) {
 				wmWindow *win = CTX_wm_window(C);
-				win->screen->do_draw_paintcursor = 1;
+				win->screen->do_draw_paintcursor = TRUE;
 				wm_tag_redraw_overlay(win, ar);
 			}
 		}
@@ -1902,10 +1902,10 @@ static void wm_event_drag_test(wmWindowManager *wm, wmWindow *win, wmEvent *even
 	if (wm->drags.first == NULL) return;
 	
 	if (event->type == MOUSEMOVE)
-		win->screen->do_draw_drag = 1;
+		win->screen->do_draw_drag = TRUE;
 	else if (event->type == ESCKEY) {
 		BLI_freelistN(&wm->drags);
-		win->screen->do_draw_drag = 1;
+		win->screen->do_draw_drag = TRUE;
 	}
 	else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
 		event->type = EVT_DROP;
@@ -1921,7 +1921,7 @@ static void wm_event_drag_test(wmWindowManager *wm, wmWindow *win, wmEvent *even
 		event->customdatafree = 1;
 		
 		/* clear drop icon */
-		win->screen->do_draw_drag = 1;
+		win->screen->do_draw_drag = TRUE;
 		
 		/* restore cursor (disabled, see wm_dragdrop.c) */
 		// WM_cursor_restore(win);
@@ -1930,7 +1930,7 @@ static void wm_event_drag_test(wmWindowManager *wm, wmWindow *win, wmEvent *even
 	/* overlap fails otherwise */
 	if (win->screen->do_draw_drag)
 		if (win->drawmethod == USER_DRAW_OVERLAP)
-			win->screen->do_draw = 1;
+			win->screen->do_draw = TRUE;
 	
 }
 
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c
index 97a431d296b..c20a281fa96 100644
--- a/source/blender/windowmanager/intern/wm_gesture.c
+++ b/source/blender/windowmanager/intern/wm_gesture.c
@@ -357,7 +357,7 @@ void wm_gesture_tag_redraw(bContext *C)
 	ARegion *ar = CTX_wm_region(C);
 	
 	if (screen)
-		screen->do_draw_gesture = 1;
+		screen->do_draw_gesture = TRUE;
 
 	wm_tag_redraw_overlay(win, ar);
 }
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index 877b8a92296..73f59a5fbae 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -37,6 +37,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_blender.h"
 #include "BKE_context.h"
@@ -449,7 +450,7 @@ void wm_jobs_timer(const bContext *C, wmWindowManager *wm, wmTimer *wt)
 
 					if (steve->flag & WM_JOB_PROGRESS)
 						WM_event_add_notifier(C, NC_WM | ND_JOB, NULL);
-					steve->do_update = 0;
+					steve->do_update = FALSE;
 				}	
 				
 				if (steve->ready) {
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index d96198413e0..b613aab32fc 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -4075,7 +4075,7 @@ static EnumPropertyItem *rna_id_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(pt
 	}
 
 	RNA_enum_item_end(&item, &totitem);
-	*do_free = 1;
+	*do_free = TRUE;
 
 	return item;
 }
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index af3ba02ed4d..95af8aa1d9e 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -238,8 +238,8 @@ wmWindow *wm_window_copy(bContext *C, wmWindow *winorig)
 	BLI_strncpy(win->screenname, win->screen->id.name + 2, sizeof(win->screenname));
 	win->screen->winid = win->winid;
 
-	win->screen->do_refresh = 1;
-	win->screen->do_draw = 1;
+	win->screen->do_refresh = TRUE;
+	win->screen->do_draw = TRUE;
 
 	win->drawmethod = -1;
 	win->drawdata = NULL;