diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-26 14:26:19 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-26 14:26:19 -0300 |
| commit | a65edb4caabec21654c56552e11aacf0fd9291de (patch) | |
| tree | 3a66ab4cac17c52f243355cb799be831e6b3a263 /tools | |
| parent | 768fc7ec8190d34c187ee2fb642bbe0c80fe8f6c (diff) | |
| parent | a9aae3000f2529dc773a876f3a3908eb9dcb824c (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 3 | ||||
| -rw-r--r-- | tools/editor/scenes_dock.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index be7214aaa7..0014c5a68a 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1407,6 +1407,9 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { } break; + case KEY_F: { + _menu_option(VIEW_CENTER_TO_SELECTION); + } break; } diff --git a/tools/editor/scenes_dock.cpp b/tools/editor/scenes_dock.cpp index 02daa3c245..86331faa1d 100644 --- a/tools/editor/scenes_dock.cpp +++ b/tools/editor/scenes_dock.cpp @@ -181,7 +181,7 @@ void ScenesDock::_instance_pressed() { if (!sel) return; String path = sel->get_metadata(0); - emit_signal("instance","res://"+path); + emit_signal("instance",path); } void ScenesDock::_open_pressed(){ |