lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-13 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge branch 'main' into 'devel'

Browse Source
This commit is contained in:
github-actions[bot] 2023-11-20 15:14:55 +00:00 committed by GitHub
commit 32d84cd97f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/meshlabplugins/io_gltf/gltf_loader.cpp
View File

@ -504,7 +504,7 @@ bool loadAttribute(
else { //if the attribute is triangle indices
//if the mode is GL_TRIANGLES and we have triangle indices
if (p.mode == 4 && p.indices >= 0 &&
if (p.mode == TINYGLTF_MODE_TRIANGLES && p.indices >= 0 &&
(unsigned int)p.indices < model.accessors.size()) {
accessor = &model.accessors[p.indices];
}
@ -577,9 +577,12 @@ bool loadAttribute(
//the mesh is not indexed, and triplets of contiguous vertices
//generate triangles
else if (attr == INDICES) {
//this case is managed when passing nullptr as data
populateAttr<unsigned char>(attr, m, ivp, nullptr, 0, 0);
attrLoaded = true;
// avoid explicitly the point clouds
if (p.mode != TINYGLTF_MODE_POINTS) {
//this case is managed when passing nullptr as data
populateAttr<unsigned char>(attr, m, ivp, nullptr, 0, 0);
attrLoaded = true;
}
}
return attrLoaded;
}