Merge pull request #48800 from madmiraal/fix-48788

Check if input marked handled before processing additional CollisionObjects
godotengine · Sep 26, 2023 · 28b1678 · 28b1678
2 parents b905959 + 3a7eda8
commit 28b1678
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
@@ -819,6 +819,9 @@ void Viewport::_process_picking() {
 					sorter.sort(res, rc);
 				}
 				for (int i = 0; i < rc; i++) {
+					if (is_input_handled()) {
+						break;
+					}
 					if (res[i].collider_id.is_valid() && res[i].collider) {
 						CollisionObject2D *co = Object::cast_to<CollisionObject2D>(res[i].collider);
 						if (co && co->can_process()) {