Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-13 06:10:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Property apply shader parameters, even when materials are being reused, fixes #14012

Browse Source
This commit is contained in:
Juan Linietsky 2017-12-26 15:13:00 -03:00
parent c2240a2a71
commit c54927a127
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gles3/rasterizer_canvas_gles3.cpp
View File

@ -1086,19 +1086,22 @@ void RasterizerCanvasGLES3::canvas_render_items(Item *p_item_list, int p_z, cons
}
}
if (shader_ptr && shader_ptr != shader_cache) {
if (shader_ptr) {
if (shader_ptr->canvas_item.uses_screen_texture && !state.canvas_texscreen_used) {
//copy if not copied before
_copy_texscreen(Rect2());
}
if (shader_ptr->canvas_item.uses_time) {
VisualServerRaster::redraw_request();
}
if (shader_ptr != shader_cache) {
state.canvas_shader.set_custom_shader(shader_ptr->custom_code_id);
state.canvas_shader.bind();
if (shader_ptr->canvas_item.uses_time) {
VisualServerRaster::redraw_request();
}
state.canvas_shader.set_custom_shader(shader_ptr->custom_code_id);
state.canvas_shader.bind();
}
if (material_ptr->ubo_id) {
glBindBufferBase(GL_UNIFORM_BUFFER, 2, material_ptr->ubo_id);