Skip to content
Snippets Groups Projects

Fix variable mixup from e8f64be6

Merged Martin Heistermann requested to merge tex2d-fix-variable-mixup into master
1 file
+ 1
1
Compare changes
  • Side-by-side
  • Inline
@@ -640,7 +640,7 @@ bool Texture2D::loadFromFile( const std::string& _filename, GLenum _minFilter, G
if (mipmaps)
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());
}
Loading