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

GCCifying Shyotl

Browse Source
This commit is contained in:
Siana Gearz
2011-02-13 23:52:39 +01:00
parent 384ed0b3f8
commit 0a9508a551
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewershadermgr.cpp
View File

@@ -410,7 +410,7 @@ void LLViewerShaderMgr::setShaders()
//Flag base shader objects for deletion //Flag base shader objects for deletion
//Don't worry-- they won't be deleted until no programs refrence them. //Don't worry-- they won't be deleted until no programs refrence them.
std::map<std::string, GLhandleARB>::iterator it = mShaderObjects.begin(); std::map<std::string, GLhandleARB>::iterator it = mShaderObjects.begin();
for(it;it!=mShaderObjects.end();++it) for(; it!=mShaderObjects.end();++it)
if(it->second) if(it->second)
glDeleteObjectARB(it->second); glDeleteObjectARB(it->second);
mShaderObjects.clear(); mShaderObjects.clear();

4
indra/newview/llviewershadermgr.h
View File

@@ -227,13 +227,13 @@ public:
shader_iter beginShaders() const shader_iter beginShaders() const
{ {
return getGlobalShaderList().begin(); return (shader_iter)(getGlobalShaderList().begin());
//return mShaderList.begin(); //return mShaderList.begin();
} }
shader_iter endShaders() const shader_iter endShaders() const
{ {
return getGlobalShaderList().end(); return (shader_iter)(getGlobalShaderList().end());
//return mShaderList.end(); //return mShaderList.end();
} }