summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-08-22 11:21:48 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-08-22 11:23:40 -0300
commite54c4028ef7e4e809f7f4b591ad12a2468f4d71b (patch)
tree9728b4514bb4e36e9f294eb2c2e920b5d488d2ae /drivers
parent260e33178cf11353dfbc208110322cc65718a7c9 (diff)
Invalid materials or shaders will now interrupt the next chain in materials, closes #9570
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gles3/rasterizer_scene_gles3.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp
index c89fc0768f..05cfba726c 100644
--- a/drivers/gles3/rasterizer_scene_gles3.cpp
+++ b/drivers/gles3/rasterizer_scene_gles3.cpp
@@ -2186,7 +2186,7 @@ void RasterizerSceneGLES3::_add_geometry(RasterizerStorageGLES3::Geometry *p_geo
while (m->next_pass.is_valid()) {
m = storage->material_owner.getornull(m->next_pass);
- if (!m)
+ if (!m || !m->shader || !m->shader->valid)
break;
_add_geometry_with_material(p_geometry, p_instance, p_owner, m, p_shadow);
}