mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-29 06:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in sf::Shader with textures

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1611 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-11-04 21:51:27 +00:00
parent 3e73efccbd
commit 9f0d6882ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SFML/Graphics/Shader.cpp
View File

@ -248,9 +248,6 @@ void Shader::Bind() const
// Bind the textures // Bind the textures
BindTextures(); BindTextures();
// Make sure that the texture unit which is left active is the number 0
GLCheck(glActiveTextureARB(GL_TEXTURE0_ARB));
// Bind the current texture // Bind the current texture
if (myCurrentTexture != -1) if (myCurrentTexture != -1)
GLCheck(glUniform1iARB(myCurrentTexture, 0)); GLCheck(glUniform1iARB(myCurrentTexture, 0));
@ -403,6 +400,9 @@ void Shader::BindTextures() const
it->second->Bind(); it->second->Bind();
it++; it++;
} }
// Make sure that the texture unit which is left active is the number 0
GLCheck(glActiveTextureARB(GL_TEXTURE0_ARB));
} }