diff options
| author | Andreas Haas <Hinsbart@users.noreply.github.com> | 2017-10-02 23:10:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 23:10:36 +0200 |
| commit | 5303efb2fabd668bef18b7ac7606426692e5d6bb (patch) | |
| tree | b699146047e60501afbfa09c36161d8ae408a223 /scene/main/viewport.cpp | |
| parent | 1e9465096d9c738057aad81d5046b85777155f87 (diff) | |
| parent | 4537977d6dd2a76580d9ab611a18634efab55c74 (diff) | |
Merge pull request #11659 from AndreaCatania/prephysics
Renamed fixed_process to physics_process
Diffstat (limited to 'scene/main/viewport.cpp')
| -rw-r--r-- | scene/main/viewport.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index e19f2031dd..37a393b55b 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -456,10 +456,10 @@ void Viewport::_notification(int p_what) { VS::get_singleton()->viewport_set_active(viewport, false); } break; - case NOTIFICATION_FIXED_PROCESS: { + case NOTIFICATION_PHYSICS_PROCESS: { if (gui.tooltip_timer >= 0) { - gui.tooltip_timer -= get_fixed_process_delta_time(); + gui.tooltip_timer -= get_physics_process_delta_time(); if (gui.tooltip_timer < 0) { _gui_show_tooltip(); } @@ -2453,7 +2453,7 @@ Rect2 Viewport::get_attach_to_screen_rect() const { void Viewport::set_physics_object_picking(bool p_enable) { physics_object_picking = p_enable; - set_fixed_process(physics_object_picking); + set_physics_process(physics_object_picking); if (!physics_object_picking) physics_picking_events.clear(); } |