Unity

Merge lp:~smspillaz/unity/4.0_fix_912682 into lp:unity/4.0

  1. 4.0_fix_912682
  2. Merge into 4.0
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 1733
Proposed branch: lp:~smspillaz/unity/4.0_fix_912682
Merge into: lp:unity/4.0
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/4.0_fix_912682
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+89182@code.launchpad.net

This proposal supersedes a proposal from 2012-01-18.

Description of the change

Fixes bug 912682

To post a comment you must log in.

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-05 11:36:23 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2012-01-19 03:32:25 +0000
4@@ -549,6 +549,7 @@
5 glEnd();
6
7 tex->disable();
8+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
9 glDisable(GL_BLEND);
10 }
11 }

Subscribers

People subscribed via source and target branches

to all changes: