Merge pull request #54512 from pycbouh/meshtool-fix-bones-crash-3.x

godotengine · Nov 2, 2021 · a05aefb · a05aefb
2 parents 4b7d1ae + ec15227
commit a05aefb
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/scene/resources/mesh_data_tool.cpp b/scene/resources/mesh_data_tool.cpp
@@ -412,6 +412,7 @@ Vector<int> MeshDataTool::get_vertex_bones(int p_idx) const {
 }
 void MeshDataTool::set_vertex_bones(int p_idx, const Vector<int> &p_bones) {
  ERR_FAIL_INDEX(p_idx, vertices.size());
+ ERR_FAIL_COND(p_bones.size() != 4);
  vertices.write[p_idx].bones = p_bones;
  format |= Mesh::ARRAY_FORMAT_BONES;
 }
@@ -422,6 +423,7 @@ Vector<float> MeshDataTool::get_vertex_weights(int p_idx) const {
 }
 void MeshDataTool::set_vertex_weights(int p_idx, const Vector<float> &p_weights) {
  ERR_FAIL_INDEX(p_idx, vertices.size());
+ ERR_FAIL_COND(p_weights.size() != 4);
  vertices.write[p_idx].weights = p_weights;
  format |= Mesh::ARRAY_FORMAT_WEIGHTS;
 }