Merge lp:~nicolas-doffay/unity/blend-mode-bug-fix-6.0 into lp:unity/6.0

Proposed by Nicolas d'Offay on 2012-10-03
Status: Merged
Approved by: Łukasz Zemczak on 2012-10-03
Approved revision: 2761
Merged at revision: 2762
Proposed branch: lp:~nicolas-doffay/unity/blend-mode-bug-fix-6.0
Merge into: lp:unity/6.0
Diff against target: 11 lines (+1/-1)
1 file modified
unity-shared/OverlayRenderer.cpp (+1/-1)
To merge this branch: bzr merge lp:~nicolas-doffay/unity/blend-mode-bug-fix-6.0
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve on 2012-10-03
Nick Dedekind (community) 2012-10-03 Approve on 2012-10-03
Review via email: mp+127830@code.launchpad.net

Commit message

Fixed flickering bug.

Description of the change

Fixed flickering bug.

To post a comment you must log in.
Nick Dedekind (nick-dedekind) wrote :

LGTM.
Wait for 6.0 ACK

review: Approve
Łukasz Zemczak (sil2100) wrote :

+1! Visual fix, so no testing coverage required.

review: Approve
Unity Merger (unity-merger) wrote :

No commit message specified.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-shared/OverlayRenderer.cpp'
2--- unity-shared/OverlayRenderer.cpp 2012-10-01 15:12:05 +0000
3+++ unity-shared/OverlayRenderer.cpp 2012-10-03 16:59:43 +0000
4@@ -725,7 +725,7 @@
5 texxform,
6 nux::color::White);
7
8- gfx_context.GetRenderStates().SetBlend(false);
9+ gfx_context.GetRenderStates().SetBlend(true);
10 gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
11 gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
12

Subscribers

People subscribed via source and target branches