Skip to content
Extraits de code Groupes Projets
Valider a9b479bd rédigé par Karl Blomster's avatar Karl Blomster
Parcourir les fichiers

Re-fix the fix in r3091; the issue wasn't what I thought it was, it was that...

Re-fix the fix in r3091; the issue wasn't what I thought it was, it was that memory was being freed twice. Fixes #906.

Originally committed to SVN as r3100.
parent d1e5ff32
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -61,7 +61,6 @@ OpenGLText::~OpenGLText() { ...@@ -61,7 +61,6 @@ OpenGLText::~OpenGLText() {
///////// /////////
// Reset // Reset
void OpenGLText::Reset() { void OpenGLText::Reset() {
for (unsigned int i=0;i<textures.size();i++) delete textures[i];
textures.clear(); textures.clear();
glyphs.clear(); glyphs.clear();
} }
...@@ -268,8 +267,10 @@ OpenGLTextTexture::OpenGLTextTexture(int w,int h) { ...@@ -268,8 +267,10 @@ OpenGLTextTexture::OpenGLTextTexture(int w,int h) {
////////////////////// //////////////////////
// Texture destructor // Texture destructor
OpenGLTextTexture::~OpenGLTextTexture() { OpenGLTextTexture::~OpenGLTextTexture() {
if (tex) if (tex) {
glDeleteTextures(1,&tex); glDeleteTextures(1,&tex);
tex = 0;
}
} }
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter