diff options
| author | marynate <mary.w.nate@gmail.com> | 2014-07-13 08:48:02 +0800 |
|---|---|---|
| committer | marynate <mary.w.nate@gmail.com> | 2014-07-13 08:48:02 +0800 |
| commit | b1e03d536f0f2cceb470b9f768b6841b4ea94251 (patch) | |
| tree | e07da91349f377f5194a069f15ebe393e018d666 | |
| parent | 9ff6d55822647c87eef392147ea15641d0922d47 (diff) | |
Fixed touchscreen was processing input in editor
| -rw-r--r-- | scene/2d/screen_button.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp index 9d0c9f3d1a..6d843b87cd 100644 --- a/scene/2d/screen_button.cpp +++ b/scene/2d/screen_button.cpp @@ -92,7 +92,10 @@ void TouchScreenButton::_notification(int p_what) { if (!get_scene()->is_editor_hint() && !OS::get_singleton()->has_touchscreen_ui_hint() && visibility==VISIBILITY_TOUCHSCREEN_ONLY) return; update(); - set_process_input(true); + + if (!get_scene()->is_editor_hint()) + set_process_input(true); + if (action.operator String()!="" && InputMap::get_singleton()->has_action(action)) { action_id=InputMap::get_singleton()->get_action_id(action); } else { |