diff options
| author | Hal9OOO <miglietta.francesco@gmail.com> | 2012-10-25 19:15:19 +0200 |
|---|---|---|
| committer | Hal9OOO <miglietta.francesco@gmail.com> | 2012-10-25 19:15:19 +0200 |
| commit | 3531d0f9abc4c773cab8353a0b70ad3d4a3a255e (patch) | |
| tree | 7f934b293c04321d6791f40f673b10a2e8ea1a0d /src/resources/openglimagehelper.cpp | |
| parent | 4358743175ef738cd2943ab1e5fb741c560f1bd4 (diff) | |
| parent | 1e4aa6a5e7476bea736b89fe5d7094b6a68705e5 (diff) | |
| download | plus-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.tar.gz plus-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.tar.bz2 plus-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.tar.xz plus-3531d0f9abc4c773cab8353a0b70ad3d4a3a255e.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/resources/openglimagehelper.cpp')
| -rw-r--r-- | src/resources/openglimagehelper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 3b93460ad..a162ccf59 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -236,8 +236,8 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage) glTexParameteri(mTextureType, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(mTextureType, GL_TEXTURE_MAG_FILTER, GL_NEAREST); } - glTexParameteri(mTextureType, GL_TEXTURE_MAX_LEVEL, 0); } + glTexParameteri(mTextureType, GL_TEXTURE_MAX_LEVEL, 0); glTexImage2D(mTextureType, 0, mInternalTextureType, tmpImage->w, tmpImage->h, @@ -297,6 +297,5 @@ void OpenGLImageHelper::initTextureSampler(GLint id) mglSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, GL_NEAREST); mglSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, GL_NEAREST); } - mglSamplerParameteri(id, GL_TEXTURE_MAX_LEVEL, 0); } #endif |