...
 
Commits (5)
......@@ -301,7 +301,7 @@ Core::init() {
QString titleInfo = OpenFlipper::Options::windowTitle();
#ifdef DEBUG
titleInfo = titleInfo + " [DEBUG]" );
titleInfo = titleInfo + " [DEBUG]";
#endif
if ( OpenFlipper::Options::coreProfile() )
......
......@@ -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());
}
......
Subproject commit da2c1168a5c1a02293a49759098960868221b815
Subproject commit 4c23effb91e6529502812240ce3b6683bfcc3939