Merge lp:~azzar1/unity/lp-1491913 into lp:unity

[Andrea Azzarone]

Merge patch from https://launchpadlibrarian.net/216276242/low-gfx-override.patch

From the bug proposal: "While discussing bug #1491555, my colleague Brian Paul suggested that in addition to forcing low gfx mode with UNITY_LOW_GFX_MODE = 1, it would also be helpful to force it out of low gfx mode with UNITY_LOW_GFX_MODE = 0."

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4000
http://jenkins.qa.ubuntu.com/job/unity-ci/1290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/66
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/66/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1290/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2015-05-22 13:20:44 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-09-08 03:00:07 +0000
@@ -290,10 +290,15 @@
       renderer.find("LLVM") != std::string::npos ||
       renderer.find("on softpipe") != std::string::npos ||
       (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1) ||
-      optionGetLowGraphicsMode())
+       optionGetLowGraphicsMode())
     {
       unity_settings_.SetLowGfxMode(true);
     }
+
+  if (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 0)
+  {
+    unity_settings_.SetLowGfxMode(false);
+  }
 #endif
 
   if (!failed)