From 22c31016c80599adababea49fbb5c46d77e68baa Mon Sep 17 00:00:00 2001 From: RaphaelHunter Date: Sat, 10 Aug 2019 21:52:51 +0800 Subject: [PATCH] fix gles2 canvas shader uniform error,close #31201 (cherry picked from commit 48f28c68bce3015bc24e52159dc2d597dffc7522) --- drivers/gles2/rasterizer_canvas_gles2.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gles2/rasterizer_canvas_gles2.cpp b/drivers/gles2/rasterizer_canvas_gles2.cpp index 9eb159cb319..f69fad11db1 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_gles2.cpp @@ -1571,6 +1571,7 @@ void RasterizerCanvasGLES2::canvas_render_items(Item *p_item_list, int p_z, cons //always re-set uniforms, since light parameters changed _set_uniforms(); + state.canvas_shader.use_material((void *)material_ptr); glActiveTexture(GL_TEXTURE0 + storage->config.max_texture_image_units - 4); RasterizerStorageGLES2::Texture *t = storage->texture_owner.getornull(light->texture);