summaryrefslogtreecommitdiff
path: root/drivers/gles2
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-10-03 07:55:08 +0200
committerGitHub <noreply@github.com>2019-10-03 07:55:08 +0200
commitce336e7e72e64fe5babdee2760d332928d670907 (patch)
tree9902a3b369fe79f2dcab8e7270336b6c3932082e /drivers/gles2
parent4f92dda8155552d47e601fe4a29518a69d8ea5ec (diff)
parent07fd9719bf0d6974bcd561f485875a0871a42808 (diff)
Merge pull request #32505 from clayjohn/GLES2-fix-probe-crash
Fix reflection probe crash in GLES2 with post-processing
Diffstat (limited to 'drivers/gles2')
-rw-r--r--drivers/gles2/rasterizer_scene_gles2.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gles2/rasterizer_scene_gles2.cpp b/drivers/gles2/rasterizer_scene_gles2.cpp
index 9530ed08c9..61bcfff419 100644
--- a/drivers/gles2/rasterizer_scene_gles2.cpp
+++ b/drivers/gles2/rasterizer_scene_gles2.cpp
@@ -3509,6 +3509,11 @@ void RasterizerSceneGLES2::render_scene(const Transform &p_cam_transform, const
_render_render_list(&render_list.elements[render_list.max_elements - render_list.alpha_element_count], render_list.alpha_element_count, cam_transform, p_cam_projection, p_shadow_atlas, env, env_radiance_tex, 0.0, 0.0, reverse_cull, true, false);
+ if (p_reflection_probe.is_valid()) {
+ // Rendering to a probe so no need for post_processing
+ return;
+ }
+
//post process
_post_process(env, p_cam_projection);