diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-19 09:32:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-19 09:32:54 +0100 |
| commit | 877f574b30b05db8b43326472ca93fcbfb119ab3 (patch) | |
| tree | 222ec328c23f1d5f7d882cc84ed06fe2aa329781 | |
| parent | 60cbb69c7c40efd72234ef10e77767347d8df6c4 (diff) | |
| parent | 7144e2fde4c8ff7aa17d4654b899a28b0da9892b (diff) | |
Merge pull request #23819 from YeldhamDev/relation_lines_extra_hide_guides
Add more places to hide guides if relationship lines are enabled
| -rw-r--r-- | editor/create_dialog.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_help.cpp | 2 | ||||
| -rw-r--r-- | editor/script_editor_debugger.cpp | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index c4516c1f17..926fa37040 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -118,8 +118,10 @@ void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode) { if (enable_rl) { search_options->add_constant_override("draw_relationship_lines", 1); search_options->add_color_override("relationship_line_color", rl_color); + search_options->add_constant_override("draw_guides", 0); } else { search_options->add_constant_override("draw_relationship_lines", 0); + search_options->add_constant_override("draw_guides", 1); } is_replace_mode = p_replace_mode; diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 3ee8d9c6c5..de1f856608 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -399,8 +399,10 @@ void EditorHelpIndex::_notification(int p_what) { if (enable_rl) { class_list->add_constant_override("draw_relationship_lines", 1); class_list->add_color_override("relationship_line_color", rl_color); + class_list->add_constant_override("draw_guides", 0); } else { class_list->add_constant_override("draw_relationship_lines", 0); + class_list->add_constant_override("draw_guides", 1); } } } diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index 089ffa285d..faa561ad54 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -1041,8 +1041,11 @@ void ScriptEditorDebugger::_notification(int p_what) { if (enable_rl) { inspect_scene_tree->add_constant_override("draw_relationship_lines", 1); inspect_scene_tree->add_color_override("relationship_line_color", rl_color); - } else + inspect_scene_tree->add_constant_override("draw_guides", 0); + } else { inspect_scene_tree->add_constant_override("draw_relationship_lines", 0); + inspect_scene_tree->add_constant_override("draw_guides", 1); + } } break; case NOTIFICATION_PROCESS: { |