diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-09 14:46:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 14:46:08 +0200 |
| commit | 006bb33b79fe110406a539a919d59e558fea5e1c (patch) | |
| tree | 094262ea6ed141d6f7795e3017b057384e35b2e5 /drivers | |
| parent | c074350609cd7afbf26070c1c6f1a0a4ca8f54f3 (diff) | |
| parent | e19a3df98fa3efa0cf80edbbb7fe8a681187832f (diff) | |
Merge pull request #40235 from nekomatata/gles2-errors-mesh-data
Fixed mesh data access errors in GLES2
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles2/rasterizer_storage_gles2.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index 6eef04b87f..4dd66c06e6 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -2566,9 +2566,7 @@ Vector<uint8_t> RasterizerStorageGLES2::mesh_surface_get_array(RID p_mesh, int p ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), Vector<uint8_t>()); Surface *surface = mesh->surfaces[p_surface]; -#ifndef TOOLS_ENABLED - ERR_PRINT("OpenGL ES 2.0 does not allow retrieving mesh array data"); -#endif + return surface->data; } @@ -2612,7 +2610,7 @@ Vector<Vector<uint8_t>> RasterizerStorageGLES2::mesh_surface_get_blend_shapes(RI ERR_FAIL_COND_V(!mesh, Vector<Vector<uint8_t>>()); ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), Vector<Vector<uint8_t>>()); #ifndef TOOLS_ENABLED - ERR_PRINT("OpenGL ES 2.0 does not allow retrieving mesh array data"); + ERR_PRINT("OpenGL ES 2.0 does not allow retrieving blend shape data"); #endif return mesh->surfaces[p_surface]->blend_shape_data; |