[Bf-blender-cvs] [5934acf] soc-2013-paint: some corrections on merge

[Antony Riakiotakis]

Commit: 5934acfd98328d1195033c65c3213f4be3eaf1cb
Author: Antony Riakiotakis
Date:   Thu Apr 3 20:08:12 2014 +0300
https://developer.blender.org/rB5934acfd98328d1195033c65c3213f4be3eaf1cb

some corrections on merge

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

M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/interface/interface_ops.c

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

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index d55e401..c5c4ead 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -926,7 +926,7 @@ typedef struct uiDragColorHandle {
 
 void UI_buttons_operatortypes(void);
 void UI_drop_color_copy(struct wmDrag *drag, struct wmDropBox *drop);
-bool UI_drop_color_poll(struct bContext *C, struct wmDrag *drag, const struct wmEvent *event);
+int UI_drop_color_poll(struct bContext *C, struct wmDrag *drag, const struct wmEvent *event);
 
 /* Helpers for Operators */
 uiBut *uiContextActiveButton(const struct bContext *C);
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index ef020c0..f6300a3 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -829,7 +829,7 @@ static void UI_OT_reloadtranslation(wmOperatorType *ot)
 	ot->exec = reloadtranslation_exec;
 }
 
-bool UI_drop_color_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED(event))
+int UI_drop_color_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED(event))
 {
 	/* should only return true for regions that include buttons, for now
 	 * return true always */
@@ -838,16 +838,16 @@ bool UI_drop_color_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED(
 		ARegion *ar = CTX_wm_region(C);
 
 		if (UI_but_active_drop_color(C))
-			return true;
+			return 1;
 
 		/* should only return true for regions that include buttons, for now
 		 * return true always */
 		if (sima && (sima->mode == SI_MODE_PAINT)
 		    && sima->image && (ar && ar->regiontype == RGN_TYPE_WINDOW))
-			return true;
+			return 1;
 	}
 
-	return false;
+	return 0;
 }
 
 void UI_drop_color_copy(wmDrag *drag, wmDropBox *drop)