Unity

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

  1. unity.fix_912682
  2. Merge into trunk
Proposed by Sam Spilsbury on 2012-01-18
Status: Merged
Approved by: Jay Taoko on 2012-01-18
Approved revision: 1843
Merged at revision: 1845
Proposed branch: lp:~smspillaz/unity/unity.fix_912682
Merge into: lp:unity
Diff against target: 11 lines (+1/-0)
1 file modified
plugins/unityshell/src/unityshell.cpp (+1/-0)
To merge this branch: bzr merge lp:~smspillaz/unity/unity.fix_912682
Reviewer Review Type Date Requested Status
Jay Taoko (community) 2012-01-18 Approve on 2012-01-18
Review via email: mp+89109@code.launchpad.net

Description of the Change

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

To post a comment you must log in.
Jay Taoko (jaytaoko) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2012-01-14 13:05:16 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2012-01-18 18:54:51 +0000
4@@ -555,6 +555,7 @@
5 glEnd();
6
7 tex->disable();
8+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
9 glDisable(GL_BLEND);
10 }
11 }