diff options
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/scene_main_loop.cpp | 3 | ||||
| -rw-r--r-- | scene/main/timer.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp index 47089638bb..ed3e419359 100644 --- a/scene/main/scene_main_loop.cpp +++ b/scene/main/scene_main_loop.cpp @@ -333,6 +333,9 @@ void SceneTree::input_text( const String& p_text ) { void SceneTree::input_event( const InputEvent& p_event ) { + if (is_editor_hint() && (p_event.type==InputEvent::JOYSTICK_MOTION || p_event.type==InputEvent::JOYSTICK_BUTTON)) + return; //avoid joy input on editor + root_lock++; //last_id=p_event.ID; diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp index 2ae918f3f3..f718a09577 100644 --- a/scene/main/timer.cpp +++ b/scene/main/timer.cpp @@ -40,7 +40,8 @@ void Timer::_notification(int p_what) { #ifdef TOOLS_ENABLED if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root() && (get_tree()->get_edited_scene_root()==this || get_tree()->get_edited_scene_root()->is_a_parent_of(this))) break; -#endif start(); +#endif + start(); } } break; case NOTIFICATION_PROCESS: { |