Merge branch 'master' into blender2.8

4 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c
index 40a2bf42a28..05d9689565c 100644
--- a/source/blender/windowmanager/intern/wm_dragdrop.c
+++ b/source/blender/windowmanager/intern/wm_dragdrop.c
@@ -187,7 +187,7 @@ void WM_drag_free_list(struct ListBase *lb)
 	}
 }
 
-static const char *dropbox_active(bContext *C, ListBase *handlers, wmDrag *drag, wmEvent *event)
+static const char *dropbox_active(bContext *C, ListBase *handlers, wmDrag *drag, const wmEvent *event)
 {
 	wmEventHandler *handler = handlers->first;
 	for (; handler; handler = handler->next) {
@@ -205,7 +205,7 @@ static const char *dropbox_active(bContext *C, ListBase *handlers, wmDrag *drag,
 }
 
 /* return active operator name when mouse is in box */
-static const char *wm_dropbox_active(bContext *C, wmDrag *drag, wmEvent *event)
+static const char *wm_dropbox_active(bContext *C, wmDrag *drag, const wmEvent *event)
 {
 	wmWindow *win = CTX_wm_window(C);
 	ScrArea *sa = CTX_wm_area(C);
@@ -225,7 +225,7 @@ static const char *wm_dropbox_active(bContext *C, wmDrag *drag, wmEvent *event)
 }
 
 
-static void wm_drop_operator_options(bContext *C, wmDrag *drag, wmEvent *event)
+static void wm_drop_operator_options(bContext *C, wmDrag *drag, const wmEvent *event)
 {
 	wmWindow *win = CTX_wm_window(C);
 	const int winsize_x = WM_window_pixels_x(win);
@@ -255,7 +255,7 @@ static void wm_drop_operator_options(bContext *C, wmDrag *drag, wmEvent *event)
 }
 
 /* called in inner handler loop, region context */
-void wm_drags_check_ops(bContext *C, wmEvent *event)
+void wm_drags_check_ops(bContext *C, const wmEvent *event)
 {
 	wmWindowManager *wm = CTX_wm_manager(C);
 	wmDrag *drag;
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 2f12dd5b672..f34781650f1 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2648,7 +2648,7 @@ static void tweak_gesture_modal(bContext *C, const wmEvent *event)
 }
 
 /* standard tweak, called after window handlers passed on event */
-void wm_tweakevent_test(bContext *C, wmEvent *event, int action)
+void wm_tweakevent_test(bContext *C, const wmEvent *event, int action)
 {
 	wmWindow *win = CTX_wm_window(C);
 	
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index f63246580ea..915e190bb98 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -59,7 +59,7 @@ void wm_operatortype_free(void);
 void wm_operatortype_init(void);
 void wm_window_keymap(wmKeyConfig *keyconf);
 
-void wm_tweakevent_test(bContext *C, wmEvent *event, int action);
+void wm_tweakevent_test(bContext *C, const wmEvent *event, int action);
 
 /* wm_gesture.c */
 #define WM_LASSO_MIN_POINTS		1024
diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h
index af72a1542f2..7e217122561 100644
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@ -95,7 +95,7 @@ void        wm_event_do_notifiers(bContext *C);
 
 /* wm_dropbox.c */
 void        wm_dropbox_free(void);
-void        wm_drags_check_ops(bContext *C, wmEvent *event);
+void        wm_drags_check_ops(bContext *C, const wmEvent *event);
 void        wm_drags_draw(bContext *C, wmWindow *win, rcti *rect);
 
 #endif /* __WM_EVENT_SYSTEM_H__ */