godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82371 from KoBeWi/menus_that_should_be_there 

Fix submenus deleted accidentally
This commit is contained in:
Rémi Verschelde 2023-09-26 17:53:02 +02:00
parent f0d86f3767 e30e84d77a
commit b905959f43
No known key found for this signature in database
GPG Key ID: C3336907360768E1
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/animation_blend_space_1d_editor.cpp
View File

@ -68,7 +68,7 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_gui_input(const Ref<InputEven
if (mb.is_valid() && mb->is_pressed() && ((tool_select->is_pressed() && mb->get_button_index() == MouseButton::RIGHT) || (mb->get_button_index() == MouseButton::LEFT && tool_create->is_pressed()))) {
if (!read_only) {
menu->clear();
menu->clear(false);
animations_menu->clear();
animations_to_add.clear();

2
editor/plugins/animation_blend_space_2d_editor.cpp
View File

@ -114,7 +114,7 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven
if (mb.is_valid() && mb->is_pressed() && ((tool_select->is_pressed() && mb->get_button_index() == MouseButton::RIGHT) || (mb->get_button_index() == MouseButton::LEFT && tool_create->is_pressed()))) {
if (!read_only) {
menu->clear();
menu->clear(false);
animations_menu->clear();
animations_to_add.clear();
List<StringName> classes;

2
editor/plugins/animation_state_machine_editor.cpp
View File

@ -557,7 +557,7 @@ void AnimationNodeStateMachineEditor::_open_menu(const Vector2 &p_position) {
return;
}
menu->clear();
menu->clear(false);
animations_menu->clear();
animations_to_add.clear();

2
editor/plugins/font_config_plugin.cpp
View File

@ -670,7 +670,7 @@ void EditorPropertyOTFeatures::update_property() {
}
// Update add menu items.
menu->clear();
menu->clear(false);
bool have_sub[FGRP_MAX];
for (int i = 0; i < FGRP_MAX; i++) {
menu_sub[i]->clear();

4
editor/scene_tree_dock.cpp
View File

@ -2924,7 +2924,7 @@ void SceneTreeDock::_add_children_to_popup(Object *p_obj, int p_depth) {
void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
if (!EditorNode::get_singleton()->get_edited_scene()) {
menu->clear();
menu->clear(false);
if (profile_allow_editing) {
menu->add_icon_shortcut(get_editor_theme_icon(SNAME("Add")), ED_GET_SHORTCUT("scene_tree/add_child_node"), TOOL_NEW);
menu->add_icon_shortcut(get_editor_theme_icon(SNAME("Instance")), ED_GET_SHORTCUT("scene_tree/instantiate_scene"), TOOL_INSTANTIATE);
@ -2943,7 +2943,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
return;
}
menu->clear();
menu->clear(false);
Ref<Script> existing_script;
bool existing_script_removable = true;