diff options
author | Juan Linietsky <reduzio@gmail.com> | 2017-08-18 18:19:12 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2017-08-18 18:21:53 -0300 |
commit | cbcf40bd31649d18b24952aec0051cdfbfa78606 (patch) | |
tree | 0f2b2f6ddd2e4a2ea119501214090988319ccc6c /editor | |
parent | b044e7d30d1f722d502d9ad564091b2e4a03b390 (diff) |
-Volume sliders, mute, solo and fx bypass are functional, closes #9021
-Fixed tree reselect, makes reselecting an audio bux FX work
Diffstat (limited to 'editor')
-rw-r--r-- | editor/editor_audio_buses.cpp | 2 | ||||
-rw-r--r-- | editor/editor_autoload_settings.cpp | 2 | ||||
-rw-r--r-- | editor/plugins/sprite_frames_editor_plugin.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 993429a5a4..282055be4a 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -705,8 +705,8 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses) { effects->set_drag_forwarding(this); effects->connect("item_rmb_selected", this, "_effect_rmb"); effects->set_allow_rmb_select(true); - effects->set_single_select_cell_editing_only_when_already_selected(true); effects->set_focus_mode(FOCUS_CLICK); + effects->set_allow_reselect(true); send = memnew(OptionButton); send->set_clip_text(true); diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index dde94cb334..0d7874818c 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -580,7 +580,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() { tree = memnew(Tree); tree->set_hide_root(true); tree->set_select_mode(Tree::SELECT_MULTI); - tree->set_single_select_cell_editing_only_when_already_selected(true); + tree->set_allow_reselect(true); tree->set_drag_forwarding(this); diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index 0f008552d0..0608ecec58 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -747,7 +747,7 @@ SpriteFramesEditor::SpriteFramesEditor() { animations->set_hide_root(true); animations->connect("cell_selected", this, "_animation_select"); animations->connect("item_edited", this, "_animation_name_edited"); - animations->set_single_select_cell_editing_only_when_already_selected(true); + animations->set_allow_reselect(true); anim_speed = memnew(SpinBox); vbc_animlist->add_margin_child(TTR("Speed (FPS):"), anim_speed); |