mirror of
https://github.com/godotengine/godot.git
synced 2025-11-01 06:01:14 +00:00
Merge pull request #105216 from bruvzg/no_dummy_rs
Remove "dummy" renderer from the editor dropdown.
This commit is contained in:
commit
334006b501
2 changed files with 8 additions and 5 deletions
|
|
@ -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<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++) {
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue