godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge branch 'master' of https://github.com/okamstudio/godot

Browse Source
This commit is contained in:
Juan Linietsky
2015-10-17 12:48:47 -03:00
parent 63033aa646 be0f7563fb
commit 6f9631fc51
45 changed files with 1893 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -144,6 +144,9 @@ void CanvasItemEditor::_unhandled_key_input(const InputEvent& p_ev) {
if (!is_visible())
return;
if (p_ev.key.mod.control)
// prevent to change tool mode when control key is pressed
return;
if (p_ev.key.pressed && !p_ev.key.echo && p_ev.key.scancode==KEY_Q)
_tool_select(TOOL_SELECT);
if (p_ev.key.pressed && !p_ev.key.echo && p_ev.key.scancode==KEY_W)