diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-24 01:25:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-24 01:25:04 +0100 |
| commit | c91ddf721f47db4afac33428f96217ecfdd60cf3 (patch) | |
| tree | 03a983bed537c68fc2b2b233ca74e40ec75d36f9 | |
| parent | 6e3ba43457360dfccdec62de4e5d3085552dbec2 (diff) | |
| parent | 7a1b7ddf6c86a52eedbec3554b4b4e7eb2126472 (diff) | |
Merge pull request #16925 from Noshyaar/envi
Fix error spam when using PanoramaSky without texture
| -rw-r--r-- | drivers/gles3/rasterizer_scene_gles3.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index 7c053e8f60..5bb332816d 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -2356,8 +2356,7 @@ void RasterizerSceneGLES3::_add_geometry_with_material(RasterizerStorageGLES3::G void RasterizerSceneGLES3::_draw_sky(RasterizerStorageGLES3::Sky *p_sky, const CameraMatrix &p_projection, const Transform &p_transform, bool p_vflip, float p_custom_fov, float p_energy) { - if (!p_sky) - return; + ERR_FAIL_COND(!p_sky); RasterizerStorageGLES3::Texture *tex = storage->texture_owner.getornull(p_sky->panorama); @@ -4337,7 +4336,8 @@ void RasterizerSceneGLES3::render_scene(const Transform &p_cam_transform, const glBindFramebuffer(GL_FRAMEBUFFER,storage->frame.current_rt->buffers.fbo); //switch to alpha fbo for sky, only diffuse/ambient matters */ - _draw_sky(sky, p_cam_projection, p_cam_transform, false, env->sky_custom_fov, env->bg_energy); + if (sky && sky->panorama.is_valid()) + _draw_sky(sky, p_cam_projection, p_cam_transform, false, env->sky_custom_fov, env->bg_energy); } //_render_list_forward(&alpha_render_list,camera_transform,camera_transform_inverse,camera_projection,false,fragment_lighting,true); |