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

Fix variable mixup from e8f64be6

See merge request !69

libs_required/ACG/GL/globjects.cc

@@ -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());
     }