Relintai/mesh_utils
1
0
Fork 0
mirror of https://github.com/Relintai/mesh_utils.git synced 2024-11-12 10:25:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error check macro typos in remove_doubles. Also add the same code to merge_mesh_array.

Browse Source
This commit is contained in:
Relintai 2021-12-30 00:01:44 +01:00
parent de821908e9
commit 461c2a80a1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mesh_utils.cpp
View File

@ -50,6 +50,13 @@ Array MeshUtils::merge_mesh_array(Array arr) const {
PoolIntArray bones = arr[VisualServer::ARRAY_BONES];
PoolRealArray weights = arr[VisualServer::ARRAY_WEIGHTS];
ERR_FAIL_COND_V(normals.size() != 0 && normals.size() != verts.size(), Array());
ERR_FAIL_COND_V(uvs.size() != 0 && uvs.size() != verts.size(), Array());
ERR_FAIL_COND_V(colors.size() != 0 && colors.size() != verts.size(), Array());
ERR_FAIL_COND_V(bones.size() != 0 && bones.size() != (verts.size() * 4), Array());
ERR_FAIL_COND_V(weights.size() != 0 && weights.size() != (verts.size() * 4), Array());
ERR_FAIL_COND_V(bones.size() != weights.size(), Array());
int i = 0;
while (i < verts.size()) {
Vector3 v = verts[i];
@ -167,8 +174,8 @@ Array MeshUtils::remove_doubles(Array arr) const {
PoolRealArray weights = arr[VisualServer::ARRAY_WEIGHTS];
ERR_FAIL_COND_V(normals.size() != 0 && normals.size() != verts.size(), Array());
ERR_FAIL_COND_V(uvs.size() != 0 && normals.size() != verts.size(), Array());
ERR_FAIL_COND_V(colors.size() != 0 && normals.size() != verts.size(), Array());
ERR_FAIL_COND_V(uvs.size() != 0 && uvs.size() != verts.size(), Array());
ERR_FAIL_COND_V(colors.size() != 0 && colors.size() != verts.size(), Array());
ERR_FAIL_COND_V(bones.size() != 0 && bones.size() != (verts.size() * 4), Array());
ERR_FAIL_COND_V(weights.size() != 0 && weights.size() != (verts.size() * 4), Array());
ERR_FAIL_COND_V(bones.size() != weights.size(), Array());