diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/lldynamictexture.cpp | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/lldynamictexture.cpp')
-rw-r--r-- | linden/indra/newview/lldynamictexture.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/linden/indra/newview/lldynamictexture.cpp b/linden/indra/newview/lldynamictexture.cpp index 4a47855..14b80d6 100644 --- a/linden/indra/newview/lldynamictexture.cpp +++ b/linden/indra/newview/lldynamictexture.cpp | |||
@@ -148,11 +148,11 @@ void LLDynamicTexture::preRender(BOOL clear_depth) | |||
148 | LLImageGL::unbindTexture(0, GL_TEXTURE_2D); | 148 | LLImageGL::unbindTexture(0, GL_TEXTURE_2D); |
149 | } | 149 | } |
150 | // Set up camera | 150 | // Set up camera |
151 | mCamera.setOrigin(*gCamera); | 151 | mCamera.setOrigin(*LLViewerCamera::getInstance()); |
152 | mCamera.setAxes(*gCamera); | 152 | mCamera.setAxes(*LLViewerCamera::getInstance()); |
153 | mCamera.setAspect(gCamera->getAspect()); | 153 | mCamera.setAspect(LLViewerCamera::getInstance()->getAspect()); |
154 | mCamera.setView(gCamera->getView()); | 154 | mCamera.setView(LLViewerCamera::getInstance()->getView()); |
155 | mCamera.setNear(gCamera->getNear()); | 155 | mCamera.setNear(LLViewerCamera::getInstance()->getNear()); |
156 | 156 | ||
157 | glViewport(mOrigin.mX, mOrigin.mY, mWidth, mHeight); | 157 | glViewport(mOrigin.mX, mOrigin.mY, mWidth, mHeight); |
158 | if (clear_depth) | 158 | if (clear_depth) |
@@ -177,11 +177,11 @@ void LLDynamicTexture::postRender(BOOL success) | |||
177 | gViewerWindow->setupViewport(); | 177 | gViewerWindow->setupViewport(); |
178 | 178 | ||
179 | // restore camera | 179 | // restore camera |
180 | gCamera->setOrigin(mCamera); | 180 | LLViewerCamera::getInstance()->setOrigin(mCamera); |
181 | gCamera->setAxes(mCamera); | 181 | LLViewerCamera::getInstance()->setAxes(mCamera); |
182 | gCamera->setAspect(mCamera.getAspect()); | 182 | LLViewerCamera::getInstance()->setAspect(mCamera.getAspect()); |
183 | gCamera->setView(mCamera.getView()); | 183 | LLViewerCamera::getInstance()->setView(mCamera.getView()); |
184 | gCamera->setNear(mCamera.getNear()); | 184 | LLViewerCamera::getInstance()->setNear(mCamera.getNear()); |
185 | } | 185 | } |
186 | 186 | ||
187 | //----------------------------------------------------------------------------- | 187 | //----------------------------------------------------------------------------- |