diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-04-13 16:23:36 -0400 |
| commit | a8ef2525711f1f9312c1c9ebb8f137f4d25e659a (patch) | |
| tree | b1486d5ab0b0eddc26a7dc0f369b12f612179869 /indra/llprimitive/llmodel.cpp | |
| parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
merge changes for 3.7.27-release
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", |