From 0fecd4ee4dfdd262be44cbc8a8981a33b9c0bd52 Mon Sep 17 00:00:00 2001 From: Yuri Roubinsky Date: Sun, 4 Apr 2021 17:50:19 +0300 Subject: [PATCH] Fix separator duplication in visual shader context menu --- editor/plugins/visual_shader_editor_plugin.cpp | 7 ++++++- editor/plugins/visual_shader_editor_plugin.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index 290d715bfcf..f372cec3100 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -2607,6 +2607,7 @@ void VisualShaderEditor::_graph_gui_input(const Ref &p_event) { if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MOUSE_BUTTON_RIGHT) { selected_constants.clear(); selected_uniforms.clear(); + selected_comment = -1; List to_change; for (int i = 0; i < graph->get_child_count(); i++) { @@ -2658,6 +2659,10 @@ void VisualShaderEditor::_graph_gui_input(const Ref &p_event) { if (temp != -1) { popup_menu->remove_item(temp); } + temp = popup_menu->get_item_index(NodeMenuOptions::SEPARATOR3); + if (temp != -1) { + popup_menu->remove_item(temp); + } temp = popup_menu->get_item_index(NodeMenuOptions::SET_COMMENT_TITLE); if (temp != -1) { popup_menu->remove_item(temp); @@ -2674,7 +2679,7 @@ void VisualShaderEditor::_graph_gui_input(const Ref &p_event) { } if (selected_constants.size() > 0 || selected_uniforms.size() > 0) { - popup_menu->add_separator("", NodeMenuOptions::SEPARATOR2); + popup_menu->add_separator("", NodeMenuOptions::SEPARATOR3); if (selected_constants.size() > 0) { popup_menu->add_item(TTR("Convert Constant(s) to Uniform(s)"), NodeMenuOptions::CONVERT_CONSTANTS_TO_UNIFORMS); diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h index a62c500d782..83b4914b663 100644 --- a/editor/plugins/visual_shader_editor_plugin.h +++ b/editor/plugins/visual_shader_editor_plugin.h @@ -198,6 +198,7 @@ class VisualShaderEditor : public VBoxContainer { SEPARATOR2, // ignore CONVERT_CONSTANTS_TO_UNIFORMS, CONVERT_UNIFORMS_TO_CONSTANTS, + SEPARATOR3, // ignore SET_COMMENT_TITLE, SET_COMMENT_DESCRIPTION, };