Merge lp:~mc-return/compiz/compiz.merge-fix1068503-scaleaddon-solid-window-highlight into lp:compiz/0.9.9
Proposed by
MC Return
Status: | Merged |
---|---|
Approved by: | Sam Spilsbury |
Approved revision: | 3442 |
Merged at revision: | 3446 |
Proposed branch: | lp:~mc-return/compiz/compiz.merge-fix1068503-scaleaddon-solid-window-highlight |
Merge into: | lp:compiz/0.9.9 |
Diff against target: |
26 lines (+7/-0) 1 file modified
plugins/scaleaddon/src/scaleaddon.cpp (+7/-0) |
To merge this branch: | bzr merge lp:~mc-return/compiz/compiz.merge-fix1068503-scaleaddon-solid-window-highlight |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sam Spilsbury | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Daniel van Vugt | Approve | ||
MC Return | Needs Resubmitting | ||
Review via email: mp+131049@code.launchpad.net |
Commit message
Re-added GL_BLEND code to the non-GLES codepath to fix the regression caused by r3320.
Fixes scaleaddon window highlight being rendered solid.
(LP #1068503)
To post a comment you must log in.
Looks fine to me, though I'm not a fan of ifdefs. Can we reduce them by moving the declaration of wasBlend to its definition?, eg
GLboolean wasBlend = glIsEnabled (GL_BLEND);
That way we can keep it within the same ifdef.