diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/lldynamictexture.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
| -rw-r--r-- | indra/newview/lldynamictexture.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index c925cc058c..24ee701ff2 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -148,11 +148,11 @@ void LLDynamicTexture::preRender(BOOL clear_depth) LLImageGL::unbindTexture(0, GL_TEXTURE_2D); } // Set up camera - mCamera.setOrigin(*gCamera); - mCamera.setAxes(*gCamera); - mCamera.setAspect(gCamera->getAspect()); - mCamera.setView(gCamera->getView()); - mCamera.setNear(gCamera->getNear()); + mCamera.setOrigin(*LLViewerCamera::getInstance()); + mCamera.setAxes(*LLViewerCamera::getInstance()); + mCamera.setAspect(LLViewerCamera::getInstance()->getAspect()); + mCamera.setView(LLViewerCamera::getInstance()->getView()); + mCamera.setNear(LLViewerCamera::getInstance()->getNear()); glViewport(mOrigin.mX, mOrigin.mY, mWidth, mHeight); if (clear_depth) @@ -177,11 +177,11 @@ void LLDynamicTexture::postRender(BOOL success) gViewerWindow->setupViewport(); // restore camera - gCamera->setOrigin(mCamera); - gCamera->setAxes(mCamera); - gCamera->setAspect(mCamera.getAspect()); - gCamera->setView(mCamera.getView()); - gCamera->setNear(mCamera.getNear()); + LLViewerCamera::getInstance()->setOrigin(mCamera); + LLViewerCamera::getInstance()->setAxes(mCamera); + LLViewerCamera::getInstance()->setAspect(mCamera.getAspect()); + LLViewerCamera::getInstance()->setView(mCamera.getView()); + LLViewerCamera::getInstance()->setNear(mCamera.getNear()); } //----------------------------------------------------------------------------- |