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

Fix disable_3d=yes -Wunused-variable errors

Browse Source 
(cherry picked from commit f25b057846)
This commit is contained in:
Rémi Verschelde 2019-04-20 11:07:58 +02:00
parent 650c8512cd
commit 34c2679506
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/main/viewport.cpp
View File

@ -391,9 +391,11 @@ void Viewport::_notification(int p_what) {
if (physics_object_picking && (to_screen_rect == Rect2() || Input::get_singleton()->get_mouse_mode() != Input::MOUSE_MODE_CAPTURED)) { if (physics_object_picking && (to_screen_rect == Rect2() || Input::get_singleton()->get_mouse_mode() != Input::MOUSE_MODE_CAPTURED)) {
#ifndef _3D_DISABLED
Vector2 last_pos(1e20, 1e20); Vector2 last_pos(1e20, 1e20);
CollisionObject *last_object = NULL; CollisionObject *last_object = NULL;
ObjectID last_id = 0; ObjectID last_id = 0;
#endif
PhysicsDirectSpaceState::RayResult result; PhysicsDirectSpaceState::RayResult result;
Physics2DDirectSpaceState *ss2d = Physics2DServer::get_singleton()->space_get_direct_state(find_world_2d()->get_space()); Physics2DDirectSpaceState *ss2d = Physics2DServer::get_singleton()->space_get_direct_state(find_world_2d()->get_space());