Merge branch 'master' into blender2.8

10 files changed, 19 insertions, 19 deletions

diff --git a/source/blender/editors/space_clip/clip_dopesheet_ops.c b/source/blender/editors/space_clip/clip_dopesheet_ops.c
index c8675fc390b..a12e8db6daf 100644
--- a/source/blender/editors/space_clip/clip_dopesheet_ops.c
+++ b/source/blender/editors/space_clip/clip_dopesheet_ops.c
@@ -53,7 +53,7 @@
 
 #include "clip_intern.h"	// own include
 
-static int space_clip_dopesheet_poll(bContext *C)
+static bool space_clip_dopesheet_poll(bContext *C)
 {
 	if (ED_space_clip_tracking_poll(C)) {
 		SpaceClip *sc = CTX_wm_space_clip(C);
@@ -70,7 +70,7 @@ static int space_clip_dopesheet_poll(bContext *C)
 
 /********************** select channel operator *********************/
 
-static int dopesheet_select_channel_poll(bContext *C)
+static bool dopesheet_select_channel_poll(bContext *C)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index 67aa7e19de7..0fb7d63180f 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -76,7 +76,7 @@
 
 /* ******** operactor poll functions ******** */
 
-int ED_space_clip_poll(bContext *C)
+bool ED_space_clip_poll(bContext *C)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 
@@ -86,7 +86,7 @@ int ED_space_clip_poll(bContext *C)
 	return false;
 }
 
-int ED_space_clip_view_clip_poll(bContext *C)
+bool ED_space_clip_view_clip_poll(bContext *C)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 
@@ -97,7 +97,7 @@ int ED_space_clip_view_clip_poll(bContext *C)
 	return false;
 }
 
-int ED_space_clip_tracking_poll(bContext *C)
+bool ED_space_clip_tracking_poll(bContext *C)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 
@@ -107,7 +107,7 @@ int ED_space_clip_tracking_poll(bContext *C)
 	return false;
 }
 
-int ED_space_clip_maskedit_poll(bContext *C)
+bool ED_space_clip_maskedit_poll(bContext *C)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 
@@ -118,7 +118,7 @@ int ED_space_clip_maskedit_poll(bContext *C)
 	return false;
 }
 
-int ED_space_clip_maskedit_mask_poll(bContext *C)
+bool ED_space_clip_maskedit_mask_poll(bContext *C)
 {
 	if (ED_space_clip_maskedit_poll(C)) {
 		MovieClip *clip = CTX_data_edit_movieclip(C);
diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c
index 02ea340eb57..b5a0e374431 100644
--- a/source/blender/editors/space_clip/clip_graph_ops.c
+++ b/source/blender/editors/space_clip/clip_graph_ops.c
@@ -55,7 +55,7 @@
 
 /******************** common graph-editing utilities ********************/
 
-static int ED_space_clip_graph_poll(bContext *C)
+static bool ED_space_clip_graph_poll(bContext *C)
 {
 	if (ED_space_clip_tracking_poll(C)) {
 		SpaceClip *sc = CTX_wm_space_clip(C);
@@ -66,7 +66,7 @@ static int ED_space_clip_graph_poll(bContext *C)
 	return false;
 }
 
-static int clip_graph_knots_poll(bContext *C)
+static bool clip_graph_knots_poll(bContext *C)
 {
 	if (ED_space_clip_graph_poll(C)) {
 		SpaceClip *sc = CTX_wm_space_clip(C);
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index c026ce8d063..26327dc9b41 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -899,7 +899,7 @@ void CLIP_OT_view_selected(wmOperatorType *ot)
 
 /********************** change frame operator *********************/
 
-static int change_frame_poll(bContext *C)
+static bool change_frame_poll(bContext *C)
 {
 	/* prevent changes during render */
 	if (G.is_rendering)
diff --git a/source/blender/editors/space_clip/clip_toolbar.c b/source/blender/editors/space_clip/clip_toolbar.c
index 3e4d0cd5bb4..304954b56e3 100644
--- a/source/blender/editors/space_clip/clip_toolbar.c
+++ b/source/blender/editors/space_clip/clip_toolbar.c
@@ -87,7 +87,7 @@ ARegion *ED_clip_has_properties_region(ScrArea *sa)
 	return arnew;
 }
 
-static int properties_poll(bContext *C)
+static bool properties_poll(bContext *C)
 {
 	return (CTX_wm_space_clip(C) != NULL);
 }
@@ -151,7 +151,7 @@ static ARegion *clip_has_tools_region(ScrArea *sa)
 	return artool;
 }
 
-static int tools_poll(bContext *C)
+static bool tools_poll(bContext *C)
 {
 	return (CTX_wm_space_clip(C) != NULL);
 }
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index e9acd7320d0..df972d89f09 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -851,7 +851,7 @@ static int clip_context(const bContext *C, const char *member, bContextDataResul
 }
 
 /* dropboxes */
-static int clip_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event))
+static bool clip_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event))
 {
 	if (drag->type == WM_DRAG_PATH)
 		if (ELEM(drag->icon, 0, ICON_FILE_IMAGE, ICON_FILE_MOVIE, ICON_FILE_BLANK)) /* rule might not work? */
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index 1572b9b8f78..42077280cca 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -2107,7 +2107,7 @@ void CLIP_OT_copy_tracks(wmOperatorType *ot)
 
 /********************* paste tracks from clipboard operator ********************/
 
-static int paste_tracks_poll(bContext *C)
+static bool paste_tracks_poll(bContext *C)
 {
 	if (ED_space_clip_tracking_poll(C)) {
 		return BKE_tracking_clipboard_has_tracks();
diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c
index 3db52e6a39b..4d1c3e0b137 100644
--- a/source/blender/editors/space_clip/tracking_ops_orient.c
+++ b/source/blender/editors/space_clip/tracking_ops_orient.c
@@ -108,7 +108,7 @@ static Object *get_orientation_object(bContext *C)
 	return object;
 }
 
-static int set_orientation_poll(bContext *C)
+static bool set_orientation_poll(bContext *C)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	if (sc != NULL) {
@@ -754,7 +754,7 @@ void CLIP_OT_set_scale(wmOperatorType *ot)
 
 /********************** set solution scale operator *********************/
 
-static int set_solution_scale_poll(bContext *C)
+static bool set_solution_scale_poll(bContext *C)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	if (sc != NULL) {
@@ -814,7 +814,7 @@ void CLIP_OT_set_solution_scale(wmOperatorType *ot)
 
 /********************** apply solution scale operator *********************/
 
-static int apply_solution_scale_poll(bContext *C)
+static bool apply_solution_scale_poll(bContext *C)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);
 	if (sc != NULL) {
diff --git a/source/blender/editors/space_clip/tracking_ops_stabilize.c b/source/blender/editors/space_clip/tracking_ops_stabilize.c
index cb9b40f8a10..2888607a049 100644
--- a/source/blender/editors/space_clip/tracking_ops_stabilize.c
+++ b/source/blender/editors/space_clip/tracking_ops_stabilize.c
@@ -50,7 +50,7 @@
 
 /********************* add 2d stabilization tracks operator ********************/
 
-static int stabilize_2d_poll(bContext *C)
+static bool stabilize_2d_poll(bContext *C)
 {
 	if (ED_space_clip_tracking_poll(C)) {
 		SpaceClip *sc = CTX_wm_space_clip(C);
diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c
index ecbc1f5ae1e..cf4687dca31 100644
--- a/source/blender/editors/space_clip/tracking_select.c
+++ b/source/blender/editors/space_clip/tracking_select.c
@@ -350,7 +350,7 @@ static int mouse_select(bContext *C, float co[2], int extend)
 	return OPERATOR_FINISHED;
 }
 
-static int select_poll(bContext *C)
+static bool select_poll(bContext *C)
 {
 	SpaceClip *sc = CTX_wm_space_clip(C);