diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-02 10:40:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-02 10:40:12 +0200 |
| commit | 437fb12e1aa3135dc7fa336bd0a53036be649ce8 (patch) | |
| tree | df8288d031d4fdf06de7f8f717cb2eafd1c2854f /scene/main | |
| parent | ded74dedefcb03fee1079d33f9688c2e401ea00e (diff) | |
| parent | 9c63ab99f0a505b0f60079bb30cc453b4415fddc (diff) | |
Merge pull request #10877 from hpvb/fix-unitialized-variables
Fix use of unitialized variables
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/viewport.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 36dbd14b40..c71a280755 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -491,7 +491,7 @@ void Viewport::_notification(int p_what) { if (physics_object_picking && (to_screen_rect == Rect2() || Input::get_singleton()->get_mouse_mode() != Input::MOUSE_MODE_CAPTURED)) { Vector2 last_pos(1e20, 1e20); - CollisionObject *last_object; + CollisionObject *last_object = NULL; ObjectID last_id = 0; PhysicsDirectSpaceState::RayResult result; Physics2DDirectSpaceState *ss2d = Physics2DServer::get_singleton()->space_get_direct_state(find_world_2d()->get_space()); @@ -604,7 +604,7 @@ void Viewport::_notification(int p_what) { } else if (pos == last_pos) { if (last_id) { - if (ObjectDB::get_instance(last_id)) { + if (ObjectDB::get_instance(last_id) && last_object) { //good, exists last_object->_input_event(camera, ev, result.position, result.normal, result.shape); if (last_object->get_capture_input_on_drag() && mb.is_valid() && mb->get_button_index() == 1 && mb->is_pressed()) { |