Merge lp:~vanvugt/compiz/fix-1048272 into lp:compiz/0.9.9

[Daniel van Vugt]

Restore cube transparency support for the top and bottom faces. It got
deleted as part of the GLES merge (r3320) in 0.9.8.0.
(LP: #1048272)

[MC Return (mc-return)]

Great job ! The cube is coming back to life :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3423
http://jenkins.qa.ubuntu.com/job/compiz-ci/193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/193/console

review: Approve (continuous-integration)

[Sam Spilsbury (smspillaz)]

review: Approve

=== modified file 'plugins/cube/src/cube.cpp'
--- plugins/cube/src/cube.cpp	2012-10-12 09:05:18 +0000
+++ plugins/cube/src/cube.cpp	2012-10-16 09:33:24 +0000
@@ -1136,6 +1136,7 @@
 #ifndef USE_GLES
 	priv->gScreen->setTexEnvMode (GL_MODULATE);
 #endif
+	glEnable (GL_BLEND);
 	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
 
@@ -1159,6 +1160,7 @@
 	priv->mTexture[0]->disable ();
 
     priv->gScreen->setTexEnvMode (GL_REPLACE);
+    glDisable (GL_BLEND);
     glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 }
 
@@ -1202,6 +1204,7 @@
 #ifndef USE_GLES
 	priv->gScreen->setTexEnvMode (GL_MODULATE);
 #endif
+	glEnable (GL_BLEND);
 	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
 
@@ -1216,6 +1219,7 @@
     streamingBuffer->render (sTransform);
 
     priv->gScreen->setTexEnvMode (GL_REPLACE);
+    glDisable (GL_BLEND);
     glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 }