Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-y-flip-fix into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

[UbuntuShape] FBO redirected shapes must be y-flipped only when not rotated.

[UbuntuShape] FBO redirected shapes must be y-flipped only when not rotated.

[Tim Peeters (tpeeters)]

It works

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-04-16 11:59:56 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-04-20 15:29:21 +0000
@@ -167,7 +167,7 @@
 
     // Send screen-space derivative factors. Note that when rendering is redirected to a
     // ShaderEffectSource (FBO), dFdy() sign is flipped.
-    const bool flipped = dfdtFactors[0] != 0.0f && state.projectionMatrix()(1, 3) < 0.0f;
+    const bool flipped = dfdtFactors[0] != 1.0f && state.projectionMatrix()(1, 3) < 0.0f;
     const QVector2D dfdtFactorsVector(dfdtFactors[0], flipped ? -dfdtFactors[1] : dfdtFactors[1]);
     program()->setUniformValue(m_dfdtFactorsId, dfdtFactorsVector);