diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:46:56 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:46:56 +0300 |
| commit | 5a0547cdc366678a21c23ac4669d9e1a867ca331 (patch) | |
| tree | 93664b4de3fdd7993f52150e6ac47c9391830a67 /indra/newview/llviewershadermgr.cpp | |
| parent | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff) | |
| parent | 8c04829110028c951d05470d54de5bf3708ff773 (diff) | |
STORM-1126 merge
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index c1abead36e..09325a8c1b 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -1492,6 +1492,16 @@ std::string LLViewerShaderMgr::getShaderDirPrefix(void) void LLViewerShaderMgr::updateShaderUniforms(LLGLSLShader * shader) { - LLWLParamManager::instance()->updateShaderUniforms(shader); - LLWaterParamManager::instance()->updateShaderUniforms(shader); + LLWLParamManager::getInstance()->updateShaderUniforms(shader); + LLWaterParamManager::getInstance()->updateShaderUniforms(shader); +} + +LLViewerShaderMgr::shader_iter LLViewerShaderMgr::beginShaders() const +{ + return mShaderList.begin(); +} + +LLViewerShaderMgr::shader_iter LLViewerShaderMgr::endShaders() const +{ + return mShaderList.end(); } |