From 9865608fb305897d1c4d0bdf89a1b23332acbc4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <kde@martin-graesslin.com>
Date: Sat, 5 Feb 2011 11:55:10 +0100
Subject: [PATCH] Fix a merge regression in Texture::release.

Seems to be a lost change caused by rebasing moved code.
---
 scene_opengl_glx.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scene_opengl_glx.cpp b/scene_opengl_glx.cpp
index 80759e9b30..fc7a52b1e7 100644
--- a/scene_opengl_glx.cpp
+++ b/scene_opengl_glx.cpp
@@ -640,7 +640,9 @@ void SceneOpenGL::Texture::init()
 void SceneOpenGL::Texture::release()
 {
     if (glxpixmap != None) {
-        glXReleaseTexImageEXT(display(), glxpixmap, GLX_FRONT_LEFT_EXT);
+        if (!options->glStrictBinding) {
+            glXReleaseTexImageEXT(display(), glxpixmap, GLX_FRONT_LEFT_EXT);
+        }
         glXDestroyPixmap(display(), glxpixmap);
         glxpixmap = None;
     }