summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2015-12-10 19:28:26 +0200
committerandreykproductengine <akleshchev@productengine.com>2015-12-10 19:28:26 +0200
commit18f4ad27b6b18f3ea32f610136858b64a816cc85 (patch)
tree26a1b68a4fba5a09c6c00bf86853e5d68e6880c9
parentd81bfeab44743efec3a6fa01123fd769b5d86d52 (diff)
MAINT-5956 FIXED Certain dae will not upload with the new importer code
-rw-r--r--indra/llprimitive/lldaeloader.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 4d8acb2808..9a1f8d09e8 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -239,7 +239,10 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
// Don't share verts within the same tri, degenerate
//
- if ((indices.size() % 3) && (indices[indices.size()-1] != shared_index))
+ U32 indx_size = indices.size();
+ U32 verts_new_tri = indx_size % 3;
+ if ((verts_new_tri < 1 || indices[indx_size - 1] != shared_index)
+ && (verts_new_tri < 2 || indices[indx_size - 2] != shared_index))
{
found = true;
indices.push_back(shared_index);