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

src/graphics/irr_driver.cpp

@@ -1171,6 +1171,11 @@ scene::ISceneNode *IrrDriver::addSkyBox(const std::vector<video::ITexture*>
                                                texture[4], texture[5]);
 }   // addSkyBox
 
+void IrrDriver::suppressSkyBox()
+{
+	SkyboxTextures.clear();
+}
+
 // ----------------------------------------------------------------------------
 /** Adds a camera to the scene.
  */

src/graphics/irr_driver.hpp

@@ -272,6 +272,7 @@ public:
                                      int vert_res, float texture_percent,
                                      float sphere_percent);
     scene::ISceneNode    *addSkyBox(const std::vector<video::ITexture*> &texture_names);
+	void suppressSkyBox();
     void                  removeNode(scene::ISceneNode *node);
     void                  removeMeshFromCache(scene::IMesh *mesh);
     void                  removeTexture(video::ITexture *t);

src/tracks/track.cpp

@@ -1585,6 +1585,7 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
 
     // Sky dome and boxes support
     // --------------------------
+	irr_driver->suppressSkyBox();
     if(m_sky_type==SKY_DOME && m_sky_textures.size() > 0)
     {
         scene::ISceneNode *node = irr_driver->addSkyDome(m_sky_textures[0],