diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-06-04 22:40:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-04 22:40:13 +0200 |
commit | 197b65f32ac811f79bc5599fbfe8cf83914b6873 (patch) | |
tree | a4f9b142bacda3fa345d973dc76e1b0d2d35294b /drivers/gles2/rasterizer_canvas_gles2.cpp | |
parent | 46c56cad0c321e17691bb2be5563a987d61ec232 (diff) | |
parent | 2b8b1d7c4632e5a8b11b5dd6d974ec94ce211289 (diff) |
Merge pull request #29411 from clayjohn/multimesh_instance_2d
Added MultiMeshInstance2D node for using MultiMesh in 2D
Diffstat (limited to 'drivers/gles2/rasterizer_canvas_gles2.cpp')
-rw-r--r-- | drivers/gles2/rasterizer_canvas_gles2.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gles2/rasterizer_canvas_gles2.cpp b/drivers/gles2/rasterizer_canvas_gles2.cpp index ee722e9d6c..b82186162d 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_gles2.cpp @@ -1081,6 +1081,8 @@ void RasterizerCanvasGLES2::_canvas_item_render_commands(Item *p_item, Item *cur } else { glVertexAttrib4fv(INSTANCE_ATTRIB_BASE + 3, buffer + color_ofs); } + } else { + glVertexAttrib4f(INSTANCE_ATTRIB_BASE + 3, 1.0, 1.0, 1.0, 1.0); } if (multi_mesh->custom_data_floats) { |