Commit c2a1ca55 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'tex2d-fix-variable-mixup' into 'master'

Fix variable mixup from e8f64be6

See merge request !69
parents 575f9c4f b6c8c307
...@@ -640,7 +640,7 @@ bool Texture2D::loadFromFile( const std::string& _filename, GLenum _minFilter, G ...@@ -640,7 +640,7 @@ bool Texture2D::loadFromFile( const std::string& _filename, GLenum _minFilter, G
if (mipmaps) if (mipmaps)
autogenerateMipMaps(); autogenerateMipMaps();
QImage gltex = ACG::Util::convertToGLFormat(gltex); QImage gltex = ACG::Util::convertToGLFormat(qtex);
setData(0, GL_RGBA, gltex.width(), gltex.height(), GL_RGBA, GL_UNSIGNED_BYTE, gltex.bits()); setData(0, GL_RGBA, gltex.width(), gltex.height(), GL_RGBA, GL_UNSIGNED_BYTE, gltex.bits());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment