Merge lp://qastaging/~3v1n0/unity/overlay-renderer-not-glsl-color-fix-7.1 into lp://qastaging/unity/7.1
Proposed by
Marco Trevisan (Treviño)
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Marco Trevisan (Treviño) | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 3575 | ||||
Proposed branch: | lp://qastaging/~3v1n0/unity/overlay-renderer-not-glsl-color-fix-7.1 | ||||
Merge into: | lp://qastaging/unity/7.1 | ||||
Diff against target: |
196 lines (+28/-23) 1 file modified
unity-shared/OverlayRenderer.cpp (+28/-23) |
||||
To merge this branch: | bzr merge lp://qastaging/~3v1n0/unity/overlay-renderer-not-glsl-color-fix-7.1 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Eleni Maria Stea (community) | Approve | ||
Review via email: mp+191964@code.qastaging.launchpad.net |
Commit message
OverlayRenderer: only and correctly initialize the BGLayer when not on GLSL codepath
Make sure we set the initial bg_layer_ value to the average color, and do this only if
really needed.
Description of the change
To post a comment you must log in.
Well done! I ran the branch using glsl and llvmpipe and it works fine in both cases!