diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
| commit | 82ae214f6a367e17dd335e80e2444cf672108821 (patch) | |
| tree | 5a2ebb115b0674698cfb0d9cbd879add63d88ece /indra/llprimitive/llmodel.cpp | |
| parent | fe8dec32dbdd6085dd582c49134551638561ca0e (diff) | |
| parent | a49e11efd9e249cc6d3cf5bcffaafe1e831f2fa9 (diff) | |
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rwxr-xr-x | indra/llprimitive/llmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index caabbf997f..1571427d51 100755 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1681,11 +1681,11 @@ LLSD LLModel::writeModel( } } - F32* src_tc = (F32*) face.mTexCoords[j].mV; - //texcoord if (face.mTexCoords) { + F32* src_tc = (F32*) face.mTexCoords[j].mV; + for (U32 k = 0; k < 2; ++k) { //for each component //convert to 16-bit normalized @@ -2012,7 +2012,7 @@ bool LLModel::loadModel(std::istream& is) } } - std::string nm[] = + static const std::string nm[] = { "lowest_lod", "low_lod", |