merged upstream changes

This commit is contained in:
tmj-fstate
2017-02-21 17:26:44 +01:00
16 changed files with 876 additions and 919 deletions

View File

@@ -502,7 +502,7 @@ opengl_texture::set_filtering() {
if( GLEW_EXT_texture_filter_anisotropic ) {
// anisotropic filtering
::glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 16.0f );
::glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, Global::AnisotropicFiltering );
}
bool sharpen{ false };