Merge branch 'master' of https://github.com/supertuxkart/stk-code

2015-09-28 09:11:20 +10:00
parent cfbd960129 11f6084fc5
commit f543ba4f7b
1 changed files with 8 additions and 2 deletions
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -157,7 +157,10 @@ IrrDriver::~IrrDriver()

    delete m_shadow_matrices;
    m_shadow_matrices = NULL;
-    Shaders::destroy();
+    if (CVS->isGLSL())
+    {
+        Shaders::destroy();
+    }
    delete m_wind;
    delete m_spherical_harmonics;
 }   // ~IrrDriver
@@ -822,7 +825,10 @@ void IrrDriver::applyResolutionSettings()
    GlowPassCmd::getInstance()->kill();
    resetTextureTable();
    // initDevice will drop the current device.
-    Shaders::destroy();
+    if (CVS->isGLSL())
+    {
+        Shaders::destroy();
+    }
    initDevice();

    // Re-init GUI engine