summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-06-11 17:44:52 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-06-11 17:44:52 -0300
commitb75fb6674b844d177d6d07526dd4d05de74294f5 (patch)
treed3edcde3b73a9abed514d6cb1537c8a5ce3382e7
parentdb1e9bac79ce4934e62b1c97586ff0ec19346ffb (diff)
do not allow picking in captured mode, closes #5134
-rw-r--r--scene/main/viewport.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index aef53ea230..79502c74ce 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -500,7 +500,7 @@ void Viewport::_notification(int p_what) {
- if (physics_object_picking) {
+ if (physics_object_picking && (render_target || Input::get_singleton()->get_mouse_mode()!=Input::MOUSE_MODE_CAPTURED)) {
Vector2 last_pos(1e20,1e20);
CollisionObject *last_object;