diff options
author | Bjoseph Wombat <bjoseph@vivox.com> | 2015-05-11 14:57:57 +0100 |
---|---|---|
committer | Bjoseph Wombat <bjoseph@vivox.com> | 2015-05-11 14:57:57 +0100 |
commit | c6650c13306b0d049ecba02710645b9ca2d90c05 (patch) | |
tree | 54932d9221df41ec9c608b70eeb5379fcb1d72c3 /indra/llprimitive/llmodel.cpp | |
parent | 7ec58ee04789a8cc819d1151529d843045651bc8 (diff) | |
parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (diff) |
updates from bitbucket repository
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", |