diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-05 15:51:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 15:51:35 +0200 |
| commit | 54e81c795529a9c35cc045acfb941417cf2b5008 (patch) | |
| tree | c4bedd83c1630a10d67005e16719d27847f3d49b /drivers/gles3 | |
| parent | dcdde2f5a9bdb74308c5316affad5af4a3bc2fdb (diff) | |
| parent | 094237eca067cc6710b06c03a46b109f7acc58b1 (diff) | |
Merge pull request #10990 from MednauN/unshaded-fix
Fix unshaded materials render
Diffstat (limited to 'drivers/gles3')
| -rw-r--r-- | drivers/gles3/rasterizer_scene_gles3.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index fb4b465d8a..2615f9c1b3 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -2301,15 +2301,12 @@ void RasterizerSceneGLES3::_add_geometry_with_material(RasterizerStorageGLES3::G //e->light_type=0xFF; // no lights! - if (p_depth_pass) { - if (p_material->shader->spatial.unshaded || state.debug_draw == VS::VIEWPORT_DEBUG_DRAW_UNSHADED) { - - e->sort_key |= SORT_KEY_UNSHADED_FLAG; - } + if (p_depth_pass || p_material->shader->spatial.unshaded || state.debug_draw == VS::VIEWPORT_DEBUG_DRAW_UNSHADED) { + e->sort_key |= SORT_KEY_UNSHADED_FLAG; + } - if (p_material->shader->spatial.depth_draw_mode == RasterizerStorageGLES3::Shader::Spatial::DEPTH_DRAW_ALPHA_PREPASS) { - e->sort_key |= RenderList::SORT_KEY_OPAQUE_PRE_PASS; - } + if (p_depth_pass && p_material->shader->spatial.depth_draw_mode == RasterizerStorageGLES3::Shader::Spatial::DEPTH_DRAW_ALPHA_PREPASS) { + e->sort_key |= RenderList::SORT_KEY_OPAQUE_PRE_PASS; } if (!p_depth_pass && (p_material->shader->spatial.uses_vertex_lighting || storage->config.force_vertex_shading)) { |