summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Haas <Hinsbart@users.noreply.github.com>2017-10-02 22:36:10 +0200
committerGitHub <noreply@github.com>2017-10-02 22:36:10 +0200
commit7cfbef91b30e191f9d7b9d950da8a0345ac8761a (patch)
treed1d957854dae311d8303299fbecb3b6f93438b19
parent33977412f3ece24b609cc06da469ba144c103c7c (diff)
parent872dd67876ac5676a28e99df0331517f446db8b1 (diff)
Merge pull request #11747 from Noshyaar/pr-๑
EditorAudioBus: restore delete option on master bus
-rw-r--r--editor/editor_audio_buses.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp
index bdd297b56c..de64c11308 100644
--- a/editor/editor_audio_buses.cpp
+++ b/editor/editor_audio_buses.cpp
@@ -405,7 +405,6 @@ void EditorAudioBus::_gui_input(const Ref<InputEvent> &p_event) {
Vector2 pos = Vector2(mb->get_position().x, mb->get_position().y);
bus_popup->set_position(get_global_position() + pos);
- bus_popup->set_item_disabled(1, get_index() == 0);
bus_popup->popup();
}
}
@@ -755,8 +754,8 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
bus_popup = bus_options->get_popup();
bus_popup->add_item(TTR("Duplicate"));
- if (!is_master)
- bus_popup->add_item(TTR("Delete"));
+ bus_popup->add_item(TTR("Delete"));
+ bus_popup->set_item_disabled(1, is_master);
bus_popup->add_item(TTR("Reset Volume"));
bus_popup->connect("index_pressed", this, "_bus_popup_pressed");