Merge branch 'master' into gfx-work

2026-03-22 15:05:03 +01:00 · 2018-09-20 19:14:28 +02:00
parent 0453e10534 d9687a4e1f
commit 7c6501bb07
114 changed files with 9353 additions and 6114 deletions
--- a/Texture.cpp
+++ b/Texture.cpp
@@ -914,6 +914,9 @@ opengl_texture::downsize( GLuint const Format ) {
        }

        WriteLog( "Texture size exceeds specified limits, downsampling data" );
+        // trim potential odd texture sizes
+        data_width  -= ( data_width % 2 );
+        data_height -= ( data_height % 2 );
        switch( Format ) {

            case GL_RGB:  { downsample< glm::tvec3<std::uint8_t> >( data_width, data_height, data.data() ); break; }