Unity

Merge lp://staging/~vanvugt/unity/fix-1037949-1036528 into lp://staging/unity

fix-1037949-1036528
Merge into trunk

Proposed by Daniel van Vugt on 2012-08-17

Status:

Merged

Approved by:

Tim Penhey on 2012-08-21

Approved revision:

no longer in the source branch.

Merged at revision:

2593

Proposed branch:

lp://staging/~vanvugt/unity/fix-1037949-1036528

Merge into:

lp://staging/unity

Diff against target:

23 lines (+3/-1)

1 file modified

plugins/unityshell/src/unityshell.cpp (+3/-1)

To merge this branch:

bzr merge lp://staging/~vanvugt/unity/fix-1037949-1036528

Related bugs:

Bug #1036528: [USE_MODERN_COMPIZ_GL] Benchmark window is mostly invisible, shrunken and displaced	Medium	Fix Released
Bug #1037949: [USE_MODERN_COMPIZ_GL] [multimonitor] If unityshell is loaded then both monitors are intermittently painted onto the second monitor (squeezed)	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Sam Spilsbury (community)		2012-08-17	Approve on 2012-08-20
Review via email: mp+120081@code.staging.launchpad.net

Commit message

Don't comment out the nuxPrologue/Epilogue functions if building
USE_MODERN_COMPIZ_GL. They are critical functions and commenting them out
causes serious rendering bugs: (LP: #1036528) (LP: #1037949)

Description of the change

Don't comment out the nuxPrologue/Epilogue functions if building
USE_MODERN_COMPIZ_GL. They are critical functions and commenting them out
causes serious rendering bugs: (LP: #1036528) (LP: #1037949)