Merge lp:~smspillaz/unity/unity.fix_912682 into lp:unity

[Sam Spilsbury]

Fixes LP bug 912682

glTexEnvMode was never reset to GL_REPLACE so GL_MODULE caused any texture with an alpha channel to draw without proper blending

[Jay Taoko (jaytaoko)]

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-01-14 13:05:16 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-01-18 18:54:51 +0000
@@ -555,6 +555,7 @@
       glEnd();
 
       tex->disable();
+      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
       glDisable(GL_BLEND);
     }
   }