diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-07-10 21:04:36 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-07-10 21:04:36 +0100 |
| commit | 0c7c3ef673c9c83aea88c9a8b865b42148f3f008 (patch) | |
| tree | bd1e018cc82b93923c6ad93ba4ab88f14079c9b4 /indra | |
| parent | 9be476e3bb4cde7b086581931ed39ac137207ffe (diff) | |
MAINT-7926, MAINT-8400 - minor edits
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llskinningutil.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp index 1f39097a98..2f3b542fa8 100644 --- a/indra/newview/llskinningutil.cpp +++ b/indra/newview/llskinningutil.cpp @@ -245,10 +245,10 @@ void LLSkinningUtil::updateRiggingInfo(const LLMeshSkinInfo* skin, LLVOAvatar *a LLVector4 wght; S32 idx[4]; F32 scale = 0.0f; + // AXON unpacking of weights should be pulled into a common function and optimized if possible. for (U32 k = 0; k < 4; k++) { F32 w = weights[k]; - idx[k] = llclamp((S32) floorf(w), (S32)0, (S32)LL_CHARACTER_MAX_ANIMATED_JOINTS-1); wght[k] = w - idx[k]; scale += wght[k]; @@ -269,8 +269,6 @@ void LLSkinningUtil::updateRiggingInfo(const LLMeshSkinInfo* skin, LLVOAvatar *a if (joint_num >= 0 && joint_num < LL_CHARACTER_MAX_ANIMATED_JOINTS) { rig_info_tab[joint_num].setIsRiggedTo(true); - //active_joints.insert(joint_num); - //active_verts++; // AXON can precompute these matMuls. LLMatrix4a bind_shape; diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 6bcbebb546..61d82ec1cf 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -108,10 +108,6 @@ static LLTrace::BlockTimerStatHandle FTM_VOLUME_TEXTURES("Volume Textures"); extern BOOL gGLDebugLoggingEnabled; -#if LL_MSVC -#pragma optimize("", off) -#endif - // Implementation class of LLMediaDataClientObject. See llmediadataclient.h class LLMediaDataClientObjectImpl : public LLMediaDataClientObject { |