diff options
| author | Aura Linden <aura@lindenlab.com> | 2015-10-27 15:33:21 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2015-10-27 15:33:21 -0700 |
| commit | 07496b015b01899b21960b60d2f3af7bf317c349 (patch) | |
| tree | f44564827e1570113457f2312ee23073135233bc /indra/llmath | |
| parent | 97374a5362f097afd3027ea51757de2e36af4798 (diff) | |
| parent | cb64c3d3c3ca027fc49ef655e2ce0acecb3b230d (diff) | |
Pulled merge from bento prime.
Diffstat (limited to 'indra/llmath')
| -rwxr-xr-x | indra/llmath/llvolume.cpp | 1 | ||||
| -rwxr-xr-x | indra/llmath/llvolume.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 8608e45a91..206330fd53 100755 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -4568,6 +4568,7 @@ LLVolumeFace::LLVolumeFace() : mTexCoords(NULL), mIndices(NULL), mWeights(NULL), + mWeightsRemapped(FALSE), mOctree(NULL), mOptimized(FALSE) { diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index 1da2d0c6b1..33e1403a14 100755 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -953,6 +953,10 @@ public: // mWeights.size() should be empty or match mVertices.size() LLVector4a* mWeights; + // Whether or not the weights have been cleaned up and remapped + // based on currently supported joints. + mutable BOOL mWeightsRemapped; + LLOctreeNode<LLVolumeTriangle>* mOctree; //whether or not face has been cache optimized |