diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-20 22:24:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 22:24:58 +0100 |
| commit | 8107fc98b6ceae749b3c10e6f0432e904961867b (patch) | |
| tree | 6c0ab829b02aba47ff3dc27b9a14d3c3a0658a3b /scene/main | |
| parent | 132e2f458df7a3551a251d68afeccd0362ca6be2 (diff) | |
| parent | 8d51618949d5ea8a94e0f504401e8f852a393968 (diff) | |
Merge pull request #25853 from marxin/fix-25316-wshadow-local
Add -Wshadow=local to warnings and fix reported issues (#25316).
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/viewport.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index f7df29fd19..31b73100b9 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -540,12 +540,12 @@ void Viewport::_notification(int p_what) { CollisionObject2D *co = Object::cast_to<CollisionObject2D>(res[i].collider); if (co) { - Map<ObjectID, uint64_t>::Element *E = physics_2d_mouseover.find(res[i].collider_id); - if (!E) { - E = physics_2d_mouseover.insert(res[i].collider_id, frame); + Map<ObjectID, uint64_t>::Element *F = physics_2d_mouseover.find(res[i].collider_id); + if (!F) { + F = physics_2d_mouseover.insert(res[i].collider_id, frame); co->_mouse_enter(); } else { - E->get() = frame; + F->get() = frame; } co->_input_event(this, ev, res[i].shape); @@ -1747,8 +1747,8 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) { while (!gui.modal_stack.empty()) { Control *top = gui.modal_stack.back()->get(); - Vector2 pos = top->get_global_transform_with_canvas().affine_inverse().xform(mpos); - if (!top->has_point(pos)) { + Vector2 pos2 = top->get_global_transform_with_canvas().affine_inverse().xform(mpos); + if (!top->has_point(pos2)) { if (top->data.modal_exclusive || top->data.modal_frame == Engine::get_singleton()->get_frames_drawn()) { //cancel event, sorry, modal exclusive EATS UP ALL |