diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/editor_node.cpp | 1 | ||||
| -rw-r--r-- | tools/editor/editor_settings.cpp | 1 | ||||
| -rw-r--r-- | tools/editor/io_plugins/editor_scene_import_plugin.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 3 | ||||
| -rw-r--r-- | tools/editor/scene_tree_dock.cpp | 1 |
5 files changed, 7 insertions, 3 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index aa47e97622..316485f42a 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -2672,6 +2672,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { break; } + _menu_option_confirm(RUN_STOP,true); get_tree()->quit(); String exec = OS::get_singleton()->get_executable_path(); diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 31da68cb8c..06e92028c7 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -451,6 +451,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("3d_editor/zoom_modifier",4); hints["3d_editor/zoom_modifier"]=PropertyInfo(Variant::INT,"3d_editor/zoom_modifier",PROPERTY_HINT_ENUM,"None,Shift,Alt,Meta,Ctrl"); set("3d_editor/emulate_numpad",false); + set("3d_editor/trackpad_hint", false); set("2d_editor/bone_width",5); set("2d_editor/bone_color1",Color(1.0,1.0,1.0,0.9)); diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp index 15e7a70111..af6ae561df 100644 --- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp @@ -1164,14 +1164,14 @@ EditorSceneImportDialog::EditorSceneImportDialog(EditorNode *p_editor, EditorSce this_import = memnew( OptionButton ); this_import->add_item("Overwrite Existing Scene"); - this_import->add_item("Owerwrite Existing, Keep Materials"); + this_import->add_item("Overwrite Existing, Keep Materials"); this_import->add_item("Keep Existing, Merge with New"); this_import->add_item("Keep Existing, Ignore New"); vbc->add_margin_child("This Time:",this_import); next_import = memnew( OptionButton ); next_import->add_item("Overwrite Existing Scene"); - next_import->add_item("Owerwrite Existing, Keep Materials"); + next_import->add_item("Overwrite Existing, Keep Materials"); next_import->add_item("Keep Existing, Merge with New"); next_import->add_item("Keep Existing, Ignore New"); vbc->add_margin_child("Next Time:",next_import); diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 9ab7aafeb2..c4d3f7282e 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1579,7 +1579,8 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { if (m.mod.alt) nav_mode = NAVIGATION_PAN; } - }else{ + + } else if (EditorSettings::get_singleton()->get("3d_editor/trackpad_hint")) { // Handle trackpad (no external mouse) use case int mod = 0; if (m.mod.shift) diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index 6b2961ea72..c6115ba87a 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -1317,6 +1317,7 @@ void SceneTreeDock::_create() { if (n==edited_scene) { edited_scene=newnode; editor->set_edited_scene(newnode); + newnode->set_editable_instances(n->get_editable_instances()); } //small hack to make collisionshapes and other kind of nodes to work |