ソースを参照

Change 2D/3D/Script/Help shortcuts back to previous values

Fixes conflicting change of focus for F3 (3D editor and "Find Next" in the Script editor).
Closes #11042.
Rémi Verschelde 8 年 前
コミット
d47a9a4984
2 ファイル変更6 行追加4 行削除
  1. 2 0
      .gitignore
  2. 4 4
      editor/editor_node.cpp

+ 2 - 0
.gitignore

@@ -3,6 +3,8 @@
 
 # Documentation generated by doxygen or from classes.xml
 doc/_build/
+# Specific to the master branch
+doc/classes/
 
 # Javascript specific
 *.bc

+ 4 - 4
editor/editor_node.cpp

@@ -6383,10 +6383,10 @@ EditorNode::EditorNode() {
 
 	FileAccess::set_file_close_fail_notify_callback(_file_access_close_error_notify);
 
-	ED_SHORTCUT("editor/editor_2d", TTR("Open 2D Editor"), KEY_F2);
-	ED_SHORTCUT("editor/editor_3d", TTR("Open 3D Editor"), KEY_F3);
-	ED_SHORTCUT("editor/editor_script", TTR("Open Script Editor"), KEY_F4);
-	ED_SHORTCUT("editor/editor_help", TTR("Search Help"), KEY_F1);
+	ED_SHORTCUT("editor/editor_2d", TTR("Open 2D Editor"), KEY_F1);
+	ED_SHORTCUT("editor/editor_3d", TTR("Open 3D Editor"), KEY_F2);
+	ED_SHORTCUT("editor/editor_script", TTR("Open Script Editor"), KEY_F3); //hack neded for script editor F3 search to work :) Assign like this or don't use F3
+	ED_SHORTCUT("editor/editor_help", TTR("Search Help"), KEY_F4);
 	ED_SHORTCUT("editor/editor_assetlib", TTR("Open Asset Library"));
 	ED_SHORTCUT("editor/editor_next", TTR("Open the next Editor"));
 	ED_SHORTCUT("editor/editor_prev", TTR("Open the previous Editor"));