1 files changed, 13 insertions, 4 deletions

diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 79502c74ce..a1df7062ea 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1574,6 +1574,14 @@ void Viewport::_gui_call_input(Control *p_control,const InputEvent& p_input) {
 
 //	_block();
 
+
+	//mouse wheel events can't be stopped
+	bool cant_stop_me_now = (p_input.type==InputEvent::MOUSE_BUTTON &&
+				 (p_input.mouse_button.button_index==BUTTON_WHEEL_DOWN ||
+				  p_input.mouse_button.button_index==BUTTON_WHEEL_UP ||
+				  p_input.mouse_button.button_index==BUTTON_WHEEL_LEFT ||
+				  p_input.mouse_button.button_index==BUTTON_WHEEL_RIGHT ) );
+
 	CanvasItem *ci=p_control;
 	while(ci) {
 
@@ -1589,7 +1597,7 @@ void Viewport::_gui_call_input(Control *p_control,const InputEvent& p_input) {
 				break;
 			if (gui.key_event_accepted)
 				break;
-			if (control->data.stop_mouse && (p_input.type==InputEvent::MOUSE_BUTTON || p_input.type==InputEvent::MOUSE_MOTION))
+			if (!cant_stop_me_now && control->data.stop_mouse && (p_input.type==InputEvent::MOUSE_BUTTON || p_input.type==InputEvent::MOUSE_MOTION))
 				break;
 		}
 
@@ -1836,8 +1844,9 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 
 						Size2 pos = mpos;
 						pos = gui.focus_inv_xform.xform(pos);
-
-						gui.mouse_over->drop_data(pos,gui.drag_data);
+						if (gui.mouse_over->can_drop_data(pos,gui.drag_data)) {
+							gui.mouse_over->drop_data(pos,gui.drag_data);
+						}
 						gui.drag_data=Variant();
 						_propagate_viewport_notification(this,NOTIFICATION_DRAG_END);
 						//change mouse accordingly
@@ -2360,8 +2369,8 @@ void Viewport::input(const InputEvent& p_event) {
 	ERR_FAIL_COND(!is_inside_tree());
 
 
-	get_tree()->_call_input_pause(input_group,"_input",p_event);
 	_gui_input_event(p_event);
+	get_tree()->_call_input_pause(input_group,"_input",p_event);
 	//get_tree()->call_group(SceneTree::GROUP_CALL_REVERSE|SceneTree::GROUP_CALL_REALTIME|SceneTree::GROUP_CALL_MULIILEVEL,gui_input_group,"_gui_input",p_event); //special one for GUI, as controls use their own process check
 }