Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

These should be inline now that they arent member functions.

Browse Source
This commit is contained in:
Shyotl
2019-08-09 23:49:16 -05:00
parent 767bdc1a30
commit a9c165f8a4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcharacter/llkeyframemotion.h
View File

@@ -175,13 +175,13 @@ int AICachedPointerPtr<KEY, T>::sCnt;
namespace LLKeyframeMotionLerp
{
template<typename T>
T lerp(F32 t, const T& before, const T& after)
inline T lerp(F32 t, const T& before, const T& after)
{
return ::lerp(before, after, t);
}
template<>
LLQuaternion lerp(F32 t, const LLQuaternion& before, const LLQuaternion& after)
inline LLQuaternion lerp(F32 t, const LLQuaternion& before, const LLQuaternion& after)
{
return ::nlerp(t, before, after);
}

1
indra/newview/llhudnametag.cpp
View File

@@ -1056,6 +1056,7 @@ void LLHUDNameTag::reshape()
F32 LLHUDNameTag::LLHUDTextSegment::getWidth(const LLFontGL* font)
{
// Singu note: Reworked hotspot. Less indirection
if (mFontWidthMap[0].first == font)
{
return mFontWidthMap[0].second;