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

Remove bogus sky error check

Browse Source
This commit is contained in:
clayjohn
2021-10-06 21:46:07 -07:00
parent 69f80b6631
commit 23dc490f40
1 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
servers/rendering/renderer_rd/renderer_scene_sky_rd.cpp
View File

@@ -1036,11 +1036,7 @@ void RendererSceneSkyRD::setup(RendererSceneEnvironmentRD *p_env, RID p_render_b
SkyShaderData *shader_data = nullptr; SkyShaderData *shader_data = nullptr;
RS::EnvironmentBG background = p_env->background; if (sky) {
if (!(background == RS::ENV_BG_CLEAR_COLOR || background == RS::ENV_BG_COLOR) || sky) {
// !BAS! Possibly silently fail here, we now get error spam when you select sky as the background but haven't setup the sky yet.
ERR_FAIL_COND(!sky);
sky_material = sky_get_material(p_env->sky); sky_material = sky_get_material(p_env->sky);
if (sky_material.is_valid()) { if (sky_material.is_valid()) {
@@ -1060,9 +1056,7 @@ void RendererSceneSkyRD::setup(RendererSceneEnvironmentRD *p_env, RID p_render_b
shader_data = material->shader_data; shader_data = material->shader_data;
ERR_FAIL_COND(!shader_data); ERR_FAIL_COND(!shader_data);
}
if (sky) {
// Invalidate supbass buffers if screen size changes // Invalidate supbass buffers if screen size changes
if (sky->screen_size != p_screen_size) { if (sky->screen_size != p_screen_size) {
sky->screen_size = p_screen_size; sky->screen_size = p_screen_size;
@@ -1371,7 +1365,6 @@ void RendererSceneSkyRD::draw(RendererSceneEnvironmentRD *p_env, bool p_can_cont
ERR_FAIL_COND(p_view_count > RendererSceneRender::MAX_RENDER_VIEWS); ERR_FAIL_COND(p_view_count > RendererSceneRender::MAX_RENDER_VIEWS);
Sky *sky = get_sky(p_env->sky); Sky *sky = get_sky(p_env->sky);
ERR_FAIL_COND(!sky);
SkyMaterialData *material = nullptr; SkyMaterialData *material = nullptr;
RID sky_material; RID sky_material;
@@ -1483,27 +1476,17 @@ void RendererSceneSkyRD::update_res_buffers(RendererSceneEnvironmentRD *p_env, u
SkyMaterialData *material = nullptr; SkyMaterialData *material = nullptr;
RID sky_material; RID sky_material;
RS::EnvironmentBG background = p_env->background; sky_material = sky_get_material(p_env->sky);
if (!(background == RS::ENV_BG_CLEAR_COLOR || background == RS::ENV_BG_COLOR) || sky) { if (sky_material.is_valid()) {
ERR_FAIL_COND(!sky); material = (SkyMaterialData *)storage->material_get_data(sky_material, RendererStorageRD::SHADER_TYPE_SKY);
sky_material = sky_get_material(p_env->sky); if (!material || !material->shader_data->valid) {
material = nullptr;
if (sky_material.is_valid()) {
material = (SkyMaterialData *)storage->material_get_data(sky_material, RendererStorageRD::SHADER_TYPE_SKY);
if (!material || !material->shader_data->valid) {
material = nullptr;
}
}
if (!material) {
sky_material = sky_shader.default_material;
material = (SkyMaterialData *)storage->material_get_data(sky_material, RendererStorageRD::SHADER_TYPE_SKY);
} }
} }
if (background == RS::ENV_BG_CLEAR_COLOR || background == RS::ENV_BG_COLOR) { if (!material) {
sky_material = sky_scene_state.fog_material; sky_material = sky_shader.default_material;
material = (SkyMaterialData *)storage->material_get_data(sky_material, RendererStorageRD::SHADER_TYPE_SKY); material = (SkyMaterialData *)storage->material_get_data(sky_material, RendererStorageRD::SHADER_TYPE_SKY);
} }
@@ -1572,7 +1555,6 @@ void RendererSceneSkyRD::draw(RD::DrawListID p_draw_list, RendererSceneEnvironme
ERR_FAIL_COND(p_view_count > RendererSceneRender::MAX_RENDER_VIEWS); ERR_FAIL_COND(p_view_count > RendererSceneRender::MAX_RENDER_VIEWS);
Sky *sky = get_sky(p_env->sky); Sky *sky = get_sky(p_env->sky);
ERR_FAIL_COND(!sky);
SkyMaterialData *material = nullptr; SkyMaterialData *material = nullptr;
RID sky_material; RID sky_material;