godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Ensure has_os_features is safely called as it can't be called from within the construct of RenderingServerDefault on which it relies

Browse Source
This commit is contained in:
Bastiaan Olij
2022-05-28 21:09:23 +10:00
parent 0810b0d471
commit 69b66ec425
5 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
servers/rendering/rendering_server_default.cpp
View File

@@ -313,7 +313,11 @@ RID RenderingServerDefault::get_test_cube() {
}
bool RenderingServerDefault::has_os_feature(const String &p_feature) const {
return RSG::storage->has_os_feature(p_feature);
if (RSG::storage) {
return RSG::storage->has_os_feature(p_feature);
} else {
return false;
}
}
void RenderingServerDefault::set_debug_generate_wireframes(bool p_generate) {
@@ -384,6 +388,8 @@ void RenderingServerDefault::draw(bool p_swap_buffers, double frame_step) {
RenderingServerDefault::RenderingServerDefault(bool p_create_thread) :
command_queue(p_create_thread) {
RenderingServer::init();
create_thread = p_create_thread;
if (!p_create_thread) {