diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2012-07-29 09:59:03 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2012-07-29 09:59:03 +0400 |
| commit | 7755873771266da847b6dd1aea5496696696eea8 (patch) | |
| tree | b47bcb40df8f6f2680bfdeeb07054b1a8c435135 /source/gameengine/Ketsji/BL_Texture.cpp | |
| parent | 0cfd402a7f7783dd29aab802b6d34412c1c11492 (diff) | |
Fix for [#27484] "Run-time command line options don't work in Multi-texture mode." reported by Josiah Lane (solarlune). The -g nomipmap = 1 option only changed the mipmapping option for bf_gpu, which BL_Texture wasn't checking.
Diffstat (limited to 'source/gameengine/Ketsji/BL_Texture.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Texture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index f2d67e9131d..fee8047642d 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -116,6 +116,7 @@ bool BL_Texture::InitFromImage(int unit, Image *img, bool mipmap) return mOk; } + mipmap = mipmap && GPU_get_mipmap(); mTexture = img->bindcode; mType = GL_TEXTURE_2D; @@ -182,7 +183,7 @@ void BL_Texture::InitGLTex(unsigned int *pix,int x,int y,bool mipmap) } else { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, x, y, 0, GL_RGBA, GL_UNSIGNED_BYTE, pix ); } |