diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-04-27 01:50:58 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-04-27 01:50:58 -0500 |
| commit | 53fd70142fb7cdefffb7845b78d1b8f58cb46e09 (patch) | |
| tree | 37ec5178631ed3b92334155f1bde9f5279d1fa9b /indra | |
| parent | 9d88673a29cd5b6ae3cadb442ff1fa850ce606bc (diff) | |
| parent | 07c0389f50ccef13ad2699e149dc4b87de3dbd70 (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index fdd48b9e9e..9d2d157c76 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2028,8 +2028,7 @@ bool LLVolume::unpackVolumeFaces(std::istream& is, S32 size) while (joint != END_INFLUENCES) { U16 influence = weights[idx++]; - influence = influence << 8; - influence |= weights[idx++]; + influence |= ((U16) weights[idx++] << 8); F32 w = llmin((F32) influence / 65535.f, 0.99999f); face.mWeights[cur_vertex].mV[cur_influence++] = (F32) joint + w; |