diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-29 16:47:26 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-29 16:47:26 +0100 |
| commit | 9d64a2e97b75251bf1cf320872e6dcad6956e0d3 (patch) | |
| tree | deafe8d518b7d66d50558a2c7f1296204b456c14 | |
| parent | 3f35f27838121e7f167d17afc32aa4ded7f1937d (diff) | |
| parent | 441af72c6e1e1f67992a07106d03d8127eb5c7e2 (diff) | |
Merge pull request #66194 from YeldhamDev/feature_fixes
Fix some stuff with the editor features
| -rw-r--r-- | editor/editor_feature_profile.cpp | 8 | ||||
| -rw-r--r-- | editor/editor_node.cpp | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp index 49fb16a095..7080cdbdd5 100644 --- a/editor/editor_feature_profile.cpp +++ b/editor/editor_feature_profile.cpp @@ -309,7 +309,11 @@ void EditorFeatureProfile::_bind_methods() { BIND_ENUM_CONSTANT(FEATURE_MAX); } -EditorFeatureProfile::EditorFeatureProfile() {} +EditorFeatureProfile::EditorFeatureProfile() { + for (int i = 0; i < FEATURE_MAX; i++) { + features_disabled[i] = false; + } +} ////////////////////////// @@ -746,6 +750,8 @@ void EditorFeatureProfileManager::_update_selected_profile() { class_list->clear(); String profile = _get_selected_profile(); + profile_actions[PROFILE_SET]->set_disabled(profile == current_profile); + if (profile.is_empty()) { //nothing selected, nothing edited property_list->clear(); edited.unref(); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 961a8ab271..05a45f4bdb 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -5877,10 +5877,6 @@ void EditorNode::_feature_profile_changed() { node_tabs->set_tab_hidden(node_tabs->get_tab_idx_from_control(NodeDock::get_singleton()), false); fs_tabs->set_tab_hidden(fs_tabs->get_tab_idx_from_control(FileSystemDock::get_singleton()), false); history_tabs->set_tab_hidden(history_tabs->get_tab_idx_from_control(history_dock), false); - history_dock->set_visible(true); - ImportDock::get_singleton()->set_visible(true); - NodeDock::get_singleton()->set_visible(true); - FileSystemDock::get_singleton()->set_visible(true); main_editor_buttons[EDITOR_3D]->set_visible(true); main_editor_buttons[EDITOR_SCRIPT]->set_visible(true); if (AssetLibraryEditorPlugin::is_available()) { |