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

Merge branch 'master' of https://bitbucket.org/Shyotl/singularityviewer-internal

Browse Source 
Conflicts:
	indra/newview/llnetmap.cpp - Thankies Shyotl~
This commit is contained in:
Inusaito Sayori
2014-07-21 23:31:59 -04:00
parent 8159eff664 cd85afc9a5
commit 5191baa659
111 changed files with 2419 additions and 3960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewerobject.cpp
View File

@@ -3719,18 +3719,18 @@ const LLQuaternion LLViewerObject::getRenderRotation() const
{
if (!mDrawable->isRoot())
{
ret = getRotation() * LLQuaternion(mDrawable->getParent()->getWorldMatrix());
ret = getRotation() * LLQuaternion(LLMatrix4(mDrawable->getParent()->getWorldMatrix().getF32ptr()));
}
else
{
ret = LLQuaternion(mDrawable->getWorldMatrix());
ret = LLQuaternion(mDrawable->getWorldMatrix().getF32ptr());
}
}
return ret;
}
const LLMatrix4 LLViewerObject::getRenderMatrix() const
const LLMatrix4a& LLViewerObject::getRenderMatrix() const
{
return mDrawable->getWorldMatrix();
}