diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-05-17 12:13:54 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-05-17 12:13:54 -0400 |
| commit | 8f94ff85f9b0318f959f066a138eac03770838cf (patch) | |
| tree | 7b2885af863ae16281f197c61bbedff4f2895e2c /indra/llprimitive/llmodel.cpp | |
| parent | 2deea74cf6f08376e14e2f7e5333fc6959d2af19 (diff) | |
| parent | a2d8f0cb3308fed1cb2c8d5fa8fb74ec4cefa45b (diff) | |
merging up latest mesh-development to nyx-mesh-development
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rw-r--r--[-rwxr-xr-x] | indra/llprimitive/llmodel.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 03b893de29..794cdb83d5 100755..100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -232,27 +232,16 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa domPRef p = tri->getP(); domListOfUInts& idx = p->getValue(); - domListOfFloats v; - domListOfFloats tc; - domListOfFloats n; + domListOfFloats dummy ; + domListOfFloats& v = pos_source ? pos_source->getFloat_array()->getValue() : dummy ; + domListOfFloats& tc = tc_source ? tc_source->getFloat_array()->getValue() : dummy ; + domListOfFloats& n = norm_source ? norm_source->getFloat_array()->getValue() : dummy ; if (pos_source) { - v = pos_source->getFloat_array()->getValue(); face.mExtents[0].set(v[0], v[1], v[2]); face.mExtents[1].set(v[0], v[1], v[2]); } - - if (tc_source) - { - tc = tc_source->getFloat_array()->getValue(); - } - - if (norm_source) - { - n = norm_source->getFloat_array()->getValue(); - } - LLVolumeFace::VertexMapData::PointMap point_map; @@ -2067,7 +2056,7 @@ void LLModel::Decomposition::fromLLSD(LLSD& decomp) std::set<U64> valid; //must have at least 4 points - llassert(count > 3); + //llassert(count > 3); for (U32 j = 0; j < count; ++j) { @@ -2085,7 +2074,7 @@ void LLModel::Decomposition::fromLLSD(LLSD& decomp) } //each hull must contain at least 4 unique points - llassert(valid.size() > 3); + //llassert(valid.size() > 3); } } |