diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-30 22:46:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-30 22:46:26 +0200 |
| commit | b3c3fe29d1ee70f30ab28254021946f85432a7e6 (patch) | |
| tree | ff074c75abedd9529dc7ec294bf055194a5c8b8a /scene/resources/mesh_data_tool.cpp | |
| parent | 36e02a0fb5cdae387ea6cb8ee730687e5890c95c (diff) | |
| parent | e50d56b4c679bf1d7e94c1a5eb3b252d298f86fe (diff) | |
Merge pull request #22543 from slapin/meshdatatool_fix
MeshDataTool memory corruption fix
Diffstat (limited to 'scene/resources/mesh_data_tool.cpp')
| -rw-r--r-- | scene/resources/mesh_data_tool.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/resources/mesh_data_tool.cpp b/scene/resources/mesh_data_tool.cpp index 6732303925..a5449e1fe8 100644 --- a/scene/resources/mesh_data_tool.cpp +++ b/scene/resources/mesh_data_tool.cpp @@ -79,9 +79,9 @@ Error MeshDataTool::create_from_surface(const Ref<ArrayMesh> &p_mesh, int p_surf if (arrays[Mesh::ARRAY_COLOR].get_type() != Variant::NIL) col = arrays[Mesh::ARRAY_COLOR].operator PoolVector<Color>().read(); - PoolVector<real_t>::Read bo; + PoolVector<int>::Read bo; if (arrays[Mesh::ARRAY_BONES].get_type() != Variant::NIL) - bo = arrays[Mesh::ARRAY_BONES].operator PoolVector<real_t>().read(); + bo = arrays[Mesh::ARRAY_BONES].operator PoolVector<int>().read(); PoolVector<real_t>::Read we; if (arrays[Mesh::ARRAY_WEIGHTS].get_type() != Variant::NIL) @@ -194,7 +194,7 @@ Error MeshDataTool::commit_to_surface(const Ref<ArrayMesh> &p_mesh) { PoolVector<Vector2> u; PoolVector<Vector2> u2; PoolVector<Color> c; - PoolVector<real_t> b; + PoolVector<int> b; PoolVector<real_t> w; PoolVector<int> in; @@ -233,7 +233,7 @@ Error MeshDataTool::commit_to_surface(const Ref<ArrayMesh> &p_mesh) { col = c.write(); } - PoolVector<real_t>::Write bo; + PoolVector<int>::Write bo; if (format & Mesh::ARRAY_FORMAT_BONES) { b.resize(vcount * 4); bo = b.write(); |