diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/create_dialog.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_node.cpp | 2 | ||||
| -rw-r--r-- | editor/import/resource_importer_layered_texture.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/scene_tree_dock.cpp | 6 |
5 files changed, 6 insertions, 8 deletions
diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index 99a2a73a75..c0c3a73957 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -674,7 +674,7 @@ CreateDialog::CreateDialog() { favorites->connect("item_activated", callable_mp(this, &CreateDialog::_favorite_activated)); favorites->add_theme_constant_override("draw_guides", 1); #ifndef _MSC_VER -#warning cant forward drag data to a non control, must be fixed +#warning cannot forward drag data to a non control, must be fixed #endif //favorites->set_drag_forwarding(this); fav_vb->add_margin_child(TTR("Favorites:"), favorites, true); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 9c0efd0881..7cff3263f2 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -6321,7 +6321,7 @@ EditorNode::EditorNode() { right_menu_hb->add_child(video_driver); #ifndef _MSC_VER -#warning neeeds to be reimplemented +#warning needs to be reimplemented #endif #if 0 String video_drivers = ProjectSettings::get_singleton()->get_custom_property_info()["rendering/quality/driver/driver_name"].hint_string; diff --git a/editor/import/resource_importer_layered_texture.cpp b/editor/import/resource_importer_layered_texture.cpp index b57ea3745d..f954931cee 100644 --- a/editor/import/resource_importer_layered_texture.cpp +++ b/editor/import/resource_importer_layered_texture.cpp @@ -180,7 +180,7 @@ void ResourceImporterLayeredTexture::_save_tex(Vector<Ref<Image>> p_images, cons f->store_32(0); //dataformat f->store_32(0); //mipmap limit - //reserverd + //reserved f->store_32(0); f->store_32(0); f->store_32(0); diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 4f783f4e27..71830d0464 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -701,7 +701,7 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save, bool p_history_back) { Ref<Script> script = current->get_edited_resource(); if (p_save) { // Do not try to save internal scripts - if (!(script->get_path() == "" || script->get_path().find("local://") != -1 || script->get_path().find("::") != -1)) { + if (!script.is_valid() || !(script->get_path() == "" || script->get_path().find("local://") != -1 || script->get_path().find("::") != -1)) { _menu_option(FILE_SAVE); } } diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 90747e45e4..13fb74987c 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -1217,7 +1217,6 @@ void SceneTreeDock::_node_selected() { Node *node = scene_tree->get_selected(); if (!node) { - editor->push_item(nullptr); return; } @@ -1902,11 +1901,10 @@ void SceneTreeDock::_selection_changed() { if (selection_size > 1) { //automatically turn on multi-edit _tool_selected(TOOL_MULTI_EDIT); - } else if (selection_size == 1) { - editor->push_item(EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list()[0]); - } else { + } else if (selection_size == 0) { editor->push_item(nullptr); } + _update_script_button(); } |