diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-02 13:03:56 +0300 |
commit | b076b3853c99d947806e05fe2dec29ca5fa944fa (patch) | |
tree | 3d975903096066e33f8cfdcff60e118685deacf8 /source/blender/windowmanager/intern/wm_dragdrop.c | |
parent | ad5a20efcef8114b589ff66d09166eabdc8e67ad (diff) | |
parent | b88e51dd55c62bdc160f33f9b2ae1727a892560a (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern/wm_dragdrop.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_dragdrop.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index 16ed51cbd80..eca3a838c0f 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -97,8 +97,9 @@ ListBase *WM_dropboxmap_find(const char *idname, int spaceid, int regionid) -wmDropBox *WM_dropbox_add(ListBase *lb, const char *idname, int (*poll)(bContext *, wmDrag *, const wmEvent *), - void (*copy)(wmDrag *, wmDropBox *)) +wmDropBox *WM_dropbox_add( + ListBase *lb, const char *idname, bool (*poll)(bContext *, wmDrag *, const wmEvent *), + void (*copy)(wmDrag *, wmDropBox *)) { wmDropBox *drop = MEM_callocN(sizeof(wmDropBox), "wmDropBox"); |