godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 19:31:35 +00:00
Code Releases Wiki Activity

Merge pull request #91198 from jsjtxietian/SurfaceTool

Browse Source 
Fix `SurfaceTool.create_from_arrays` crash with bad index
This commit is contained in:
Rémi Verschelde
2024-04-26 11:09:08 +02:00
parent f55b81be1e 01135bc533
commit 86bf8354a0
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/surface_tool.cpp
View File

@@ -803,6 +803,8 @@ const uint32_t SurfaceTool::custom_mask[RS::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_
const uint32_t SurfaceTool::custom_shift[RS::ARRAY_CUSTOM_COUNT] = { Mesh::ARRAY_FORMAT_CUSTOM0_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM1_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM2_SHIFT, Mesh::ARRAY_FORMAT_CUSTOM3_SHIFT };
void SurfaceTool::create_vertex_array_from_arrays(const Array &p_arrays, LocalVector<SurfaceTool::Vertex> &ret, uint64_t *r_format) {
ERR_FAIL_INDEX(RS::ARRAY_WEIGHTS, p_arrays.size());
ret.clear();
Vector<Vector3> varr = p_arrays[RS::ARRAY_VERTEX];