Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-02 06:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #105216 from bruvzg/no_dummy_rs

Browse source 
Remove "dummy" renderer from the editor dropdown.
This commit is contained in:
Thaddeus Crews 2025-04-11 09:50:46 -05:00
commit 334006b501
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
editor/editor_node.cpp
View file

@ -7848,6 +7848,9 @@ EditorNode::EditorNode() {
PackedStringArray renderers = ProjectSettings::get_singleton()->get_custom_property_info().get(StringName("rendering/renderer/rendering_method")).hint_string.split(",", false); 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++) { for (int i = 0; i < renderers.size(); i++) {
String rendering_method = renderers[i]; String rendering_method = renderers[i];
if (rendering_method == "dummy") {
continue;
}
_add_renderer_entry(rendering_method, false); _add_renderer_entry(rendering_method, false);
renderer->set_item_metadata(i, rendering_method); renderer->set_item_metadata(i, rendering_method);
// Lowercase for standard comparison. // Lowercase for standard comparison.

10
main/main.cpp
View file

@ -2384,10 +2384,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
default_renderer_mobile = "gl_compatibility"; default_renderer_mobile = "gl_compatibility";
} }
#endif #endif
if (!renderer_hints.is_empty()) {
renderer_hints += ",";
}
renderer_hints += "dummy";
if (!rendering_method.is_empty()) { if (!rendering_method.is_empty()) {
if (rendering_method != "forward_plus" && 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 ", OS::get_singleton()->print("Unknown rendering method '%s', aborting.\nValid options are ",
rendering_method.utf8().get_data()); rendering_method.utf8().get_data());
const Vector<String> rendering_method_hints = renderer_hints.split(","); Vector<String> rendering_method_hints = renderer_hints.split(",");
rendering_method_hints.push_back("dummy");
for (int i = 0; i < rendering_method_hints.size(); i++) { for (int i = 0; i < rendering_method_hints.size(); i++) {
if (i == rendering_method_hints.size() - 1) { if (i == rendering_method_hints.size() - 1) {
OS::get_singleton()->print(" and "); 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; goto error;
} }
} }
if (renderer_hints.is_empty()) {
renderer_hints = "dummy";
}
if (!rendering_driver.is_empty()) { if (!rendering_driver.is_empty()) {
// As the rendering drivers available may depend on the display driver and renderer // As the rendering drivers available may depend on the display driver and renderer