From 1054ab823961597a07c39065d18fa8d379e3347d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=CC=84vels=20Nadtoc=CC=8Cajevs?= <7645683+bruvzg@users.noreply.github.com> Date: Wed, 9 Apr 2025 23:42:49 +0300 Subject: [PATCH] Remove "dummy" renderer from the editor dropdown. --- editor/editor_node.cpp | 3 +++ main/main.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 71314430a31..c40f7bc42c8 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -7844,6 +7844,9 @@ EditorNode::EditorNode() { PackedStringArray renderers = ProjectSettings::get_singleton()->get_custom_property_info().get(StringName("rendering/renderer/rendering_method")).hint_string.split(",", false); for (int i = 0; i < renderers.size(); i++) { String rendering_method = renderers[i]; + if (rendering_method == "dummy") { + continue; + } _add_renderer_entry(rendering_method, false); renderer->set_item_metadata(i, rendering_method); // Lowercase for standard comparison. diff --git a/main/main.cpp b/main/main.cpp index 86ae8c16a1d..aedfa1921ad 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2384,10 +2384,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph default_renderer_mobile = "gl_compatibility"; } #endif - if (!renderer_hints.is_empty()) { - renderer_hints += ","; - } - renderer_hints += "dummy"; if (!rendering_method.is_empty()) { if (rendering_method != "forward_plus" && @@ -2397,7 +2393,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph OS::get_singleton()->print("Unknown rendering method '%s', aborting.\nValid options are ", rendering_method.utf8().get_data()); - const Vector rendering_method_hints = renderer_hints.split(","); + Vector rendering_method_hints = renderer_hints.split(","); + rendering_method_hints.push_back("dummy"); for (int i = 0; i < rendering_method_hints.size(); i++) { if (i == rendering_method_hints.size() - 1) { OS::get_singleton()->print(" and "); @@ -2411,6 +2408,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph goto error; } } + if (renderer_hints.is_empty()) { + renderer_hints = "dummy"; + } if (!rendering_driver.is_empty()) { // As the rendering drivers available may depend on the display driver and renderer