[Bf-blender-cvs] [16ea400] master: Code cleanup: use bool/true/false in clip editor

Sergey Sharybin noreply at git.blender.org
Thu Mar 20 10:52:52 CET 2014


Commit: 16ea400b29c1ff01d298a1f4c8c7f1633775f031
Author: Sergey Sharybin
Date:   Thu Mar 20 15:52:00 2014 +0600
https://developer.blender.org/rB16ea400b29c1ff01d298a1f4c8c7f1633775f031

Code cleanup: use bool/true/false in clip editor

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

M	source/blender/editors/space_clip/clip_dopesheet_ops.c
M	source/blender/editors/space_clip/clip_editor.c
M	source/blender/editors/space_clip/clip_graph_draw.c
M	source/blender/editors/space_clip/clip_graph_ops.c
M	source/blender/editors/space_clip/clip_ops.c
M	source/blender/editors/space_clip/space_clip.c
M	source/blender/editors/space_clip/tracking_ops.c

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

diff --git a/source/blender/editors/space_clip/clip_dopesheet_ops.c b/source/blender/editors/space_clip/clip_dopesheet_ops.c
index 0fbed2c..8cd096a 100644
--- a/source/blender/editors/space_clip/clip_dopesheet_ops.c
+++ b/source/blender/editors/space_clip/clip_dopesheet_ops.c
@@ -113,7 +113,7 @@ static int dopesheet_select_channel_exec(bContext *C, wmOperator *op)
 
 			if (track->flag & TRACK_DOPE_SEL) {
 				tracking->act_track = track;
-				BKE_tracking_track_select(tracksbase, track, TRACK_AREA_ALL, TRUE);
+				BKE_tracking_track_select(tracksbase, track, TRACK_AREA_ALL, true);
 			}
 		}
 		else if (!extend)
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index d417776..42b4051 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -1026,7 +1026,7 @@ void clip_start_prefetch_job(const bContext *C)
 	WM_jobs_timer(wm_job, 0.2, NC_MOVIECLIP | ND_DISPLAY, 0);
 	WM_jobs_callbacks(wm_job, prefetch_startjob, NULL, NULL, NULL);
 
-	G.is_break = FALSE;
+	G.is_break = false;
 
 	/* and finally start the job */
 	WM_jobs_start(CTX_wm_manager(C), wm_job);
diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c
index 34d4434..bce671f 100644
--- a/source/blender/editors/space_clip/clip_graph_draw.c
+++ b/source/blender/editors/space_clip/clip_graph_draw.c
@@ -184,7 +184,7 @@ static void draw_tracks_motion_curves(View2D *v2d, SpaceClip *sc)
 	glDisable(GL_BLEND);
 
 	/* selected knot handles on top of curves */
-	userdata.sel = TRUE;
+	userdata.sel = true;
 	clip_graph_tracking_values_iterate(sc,
 	                                   (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
 	                                   (sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c
index 44261b8..45b8358 100644
--- a/source/blender/editors/space_clip/clip_graph_ops.c
+++ b/source/blender/editors/space_clip/clip_graph_ops.c
@@ -136,7 +136,7 @@ static void find_nearest_tracking_segment_cb(void *userdata, MovieTrackingTrack
 		}
 	}
 
-	data->has_prev = TRUE;
+	data->has_prev = true;
 	copy_v2_v2(data->prev_co, co);
 }
 
@@ -248,7 +248,7 @@ static bool mouse_select_curve(bContext *C, float co[2], bool extend)
 			ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, object);
 
 			tracking->act_track = userdata.track;
-			BKE_tracking_track_select(tracksbase, userdata.track, TRACK_AREA_ALL, TRUE);
+			BKE_tracking_track_select(tracksbase, userdata.track, TRACK_AREA_ALL, true);
 
 			/* deselect all knots on newly selected curve */
 			clip_graph_tracking_iterate(sc,
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index 14cd7de..a7cdff0 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -1266,7 +1266,7 @@ static int clip_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op))
 	WM_jobs_timer(wm_job, 0.2, NC_MOVIECLIP | ND_DISPLAY, 0);
 	WM_jobs_callbacks(wm_job, proxy_startjob, NULL, NULL, proxy_endjob);
 
-	G.is_break = FALSE;
+	G.is_break = false;
 	WM_jobs_start(CTX_wm_manager(C), wm_job);
 
 	ED_area_tag_redraw(CTX_wm_area(C));
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index 2f1d78b..9b7c666 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -1198,7 +1198,7 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
 			                    sc->mask_info.overlay_mode,
 			                    mask_width, mask_height,
 			                    aspx, aspy,
-			                    TRUE, TRUE,
+			                    true, true,
 			                    sc->stabmat, C);
 		}
 	}
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index 708c597..fe4e34f 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -1474,7 +1474,7 @@ static int track_markers_invoke(bContext *C, wmOperator *op, const wmEvent *UNUS
 
 	WM_jobs_callbacks(wm_job, track_markers_startjob, NULL, track_markers_updatejob, track_markers_endjob);
 
-	G.is_break = FALSE;
+	G.is_break = false;
 
 	WM_jobs_start(CTX_wm_manager(C), wm_job);
 	WM_cursor_wait(0);
@@ -1741,7 +1741,7 @@ static int solve_camera_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE
 	WM_jobs_timer(wm_job, 0.1, NC_MOVIECLIP | NA_EVALUATED, 0);
 	WM_jobs_callbacks(wm_job, solve_camera_startjob, NULL, solve_camera_updatejob, NULL);
 
-	G.is_break = FALSE;
+	G.is_break = false;
 
 	WM_jobs_start(CTX_wm_manager(C), wm_job);
 	WM_cursor_wait(0);
@@ -2271,7 +2271,7 @@ static void set_axis(Scene *scene,  Object *ob, MovieClip *clip, MovieTrackingOb
 		if (!flip) {
 			float lmat[4][4], ilmat[4][4], rmat[3][3];
 
-			BKE_object_rot_to_mat3(ob, rmat, TRUE);
+			BKE_object_rot_to_mat3(ob, rmat, true);
 			invert_m3(rmat);
 			mul_m4_m4m3(mat, mat, rmat);




More information about the Bf-blender-cvs mailing list