diff options
| author | Callum Prentice <callum@lindenlab.com> | 2016-12-21 11:22:39 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2016-12-21 11:22:39 -0800 |
| commit | 60cbea49630e0caf27f3a13e16150d3538e6a6d1 (patch) | |
| tree | 7cb62301733352bc304297b4486be37c4919e8d1 /indra/newview/llskinningutil.cpp | |
| parent | 84bf05e003d7f7aa7c7cc491b9496d78ffaac4b4 (diff) | |
| parent | a2a5bdf4b58e398f357b865ba49d7f8d380a0428 (diff) | |
Automated merge with lindenlab/viewer64 and lindenlab/nat_viewer64
Diffstat (limited to 'indra/newview/llskinningutil.cpp')
| -rw-r--r-- | indra/newview/llskinningutil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp index cf09f6f978..dba690242a 100644 --- a/indra/newview/llskinningutil.cpp +++ b/indra/newview/llskinningutil.cpp @@ -122,7 +122,7 @@ void LLSkinningUtil::initSkinningMatrixPalette( // static void LLSkinningUtil::checkSkinWeights(LLVector4a* weights, U32 num_vertices, const LLMeshSkinInfo* skin) { -#ifndef LL_RELEASE_FOR_DOWNLOAD +#ifdef SHOW_ASSERT // same condition that controls llassert() const S32 max_joints = skin->mJointNames.size(); for (U32 j=0; j<num_vertices; j++) { |