diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-08 10:58:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 10:58:59 +0200 |
| commit | b60754ab405d6a332c33f12f9df9399f70ee7164 (patch) | |
| tree | a23ac583ea6702fd52c928f53f4cee854e200554 | |
| parent | 1ca555f1fb36805d243b67c863ff7f7b01ce750f (diff) | |
| parent | 7cbfce7a8c9883693a54a589e45ef788f25643b2 (diff) | |
Merge pull request #26839 from toasteater/fix/keep-linear
Respect keep_3d_linear when transparent_bg is on.
| -rw-r--r-- | drivers/gles3/rasterizer_scene_gles3.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index 0460e98e28..d1b704e09a 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -3667,7 +3667,7 @@ void RasterizerSceneGLES3::_post_process(Environment *env, const CameraMatrix &p } glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, storage->frame.current_rt->effects.mip_maps[0].color); - storage->shaders.copy.set_conditional(CopyShaderGLES3::LINEAR_TO_SRGB, true); + storage->shaders.copy.set_conditional(CopyShaderGLES3::LINEAR_TO_SRGB, !storage->frame.current_rt->flags[RasterizerStorage::RENDER_TARGET_KEEP_3D_LINEAR]); storage->shaders.copy.set_conditional(CopyShaderGLES3::V_FLIP, storage->frame.current_rt->flags[RasterizerStorage::RENDER_TARGET_VFLIP]); storage->shaders.copy.set_conditional(CopyShaderGLES3::DISABLE_ALPHA, !storage->frame.current_rt->flags[RasterizerStorage::RENDER_TARGET_TRANSPARENT]); storage->shaders.copy.bind(); |