[Bf-blender-cvs] [5a17c9bcbca] temp-tab_drag_drop: Merge branch 'blender2.8' into temp-tab_drag_drop

[Severin]

Commit: 5a17c9bcbca737525fa535ceb45f9769a34a4df7
Author: Severin
Date:   Mon Jul 2 14:50:45 2018 +0200
Branches: temp-tab_drag_drop
https://developer.blender.org/rB5a17c9bcbca737525fa535ceb45f9769a34a4df7

Merge branch 'blender2.8' into temp-tab_drag_drop

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



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

diff --cc source/blender/windowmanager/WM_api.h
index 389eb2a4d71,3d1ee273108..eddf1379eb7
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -481,11 -476,9 +483,11 @@@ void				WM_event_drag_image(struct wmDr
  void                WM_drag_free(struct wmDrag *drag);
  void                WM_drag_free_list(struct ListBase *lb);
  
- struct wmDropBox *WM_dropbox_add(
-         ListBase *lb, const char *idname, int (*poll)(struct bContext *, struct wmDrag *, const struct wmEvent *event),
+ struct wmDropBox	*WM_dropbox_add(
+         ListBase *lb, const char *idname, bool (*poll)(struct bContext *, struct wmDrag *, const struct wmEvent *event),
          void (*copy)(struct wmDrag *, struct wmDropBox *));
 +struct wmDropBox *WM_dropbox_add_custom_drop_handler(
 +        ListBase *dropbox_list, void (*drop_handler)(struct wmDrag *, const struct wmEvent *));
  ListBase	*WM_dropboxmap_find(const char *idname, int spaceid, int regionid);
  
  			/* Set OpenGL viewport and scissor */