godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #57105 from rafallus/regression/3d_disabled

Browse Source
This commit is contained in:
Rémi Verschelde 2022-01-24 11:41:15 +01:00 committed by GitHub
commit e8789132b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scene/main/viewport.cpp
View File

@ -523,6 +523,13 @@ void Viewport::_process_picking() {
_drop_physics_mouseover(true); _drop_physics_mouseover(true);
#ifndef _3D_DISABLED
Vector2 last_pos(1e20, 1e20);
CollisionObject3D *last_object = nullptr;
ObjectID last_id;
PhysicsDirectSpaceState3D::RayResult result;
#endif // _3D_DISABLED
PhysicsDirectSpaceState2D *ss2d = PhysicsServer2D::get_singleton()->space_get_direct_state(find_world_2d()->get_space()); PhysicsDirectSpaceState2D *ss2d = PhysicsServer2D::get_singleton()->space_get_direct_state(find_world_2d()->get_space());
if (physics_has_last_mousepos) { if (physics_has_last_mousepos) {
@ -690,10 +697,6 @@ void Viewport::_process_picking() {
} }
#ifndef _3D_DISABLED #ifndef _3D_DISABLED
Vector2 last_pos(1e20, 1e20);
CollisionObject3D *last_object = nullptr;
ObjectID last_id;
PhysicsDirectSpaceState3D::RayResult result;
bool captured = false; bool captured = false;
if (physics_object_capture.is_valid()) { if (physics_object_capture.is_valid()) {