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

Merge pull request #11837 from Listwon/FixEditorTooltips 

Fix "enable_object_picking" disables editor tooltips
This commit is contained in:
Rémi Verschelde 2017-11-10 10:57:53 +01:00 committed by GitHub
parent 49a12ddbc5 924cd6c56d
commit 55c010aa61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/main/viewport.cpp
View File

@ -349,6 +349,8 @@ void Viewport::_notification(int p_what) {
} break;
case NOTIFICATION_READY: {
set_fixed_process(true);
#ifndef _3D_DISABLED
if (listeners.size() && !listener) {
Listener *first = NULL;
@ -2347,7 +2349,6 @@ Rect2 Viewport::get_render_target_to_screen_rect() const {
void Viewport::set_physics_object_picking(bool p_enable) {
physics_object_picking = p_enable;
set_fixed_process(physics_object_picking);
if (!physics_object_picking)
physics_picking_events.clear();
}