From bea4efecfc38e5c83b871d17b4bf4669b994e138 Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sat, 30 Apr 2011 17:42:44 +0000
Subject: [PATCH] Fix material 2D not always being enabled when it should

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8485 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/graphics/irr_driver.cpp     | 4 ++++
 src/states_screens/race_gui.cpp | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 7f7c9a6ea..eef1d6c13 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -1162,6 +1162,8 @@ void IrrDriver::update(float dt)
 
         if (inRace)
         {
+            irr_driver->getVideoDriver()->enableMaterial2D();
+
             RaceGUIBase *rg = world->getRaceGUI();
             for(unsigned int i=0; i<world->getNumKarts(); i++)
             {
@@ -1178,11 +1180,13 @@ void IrrDriver::update(float dt)
                         World::getWorld()->getPhysics()->draw();
                 }   // if kart->Camera
             }   // for i<world->getNumKarts()
+            
             // To draw the race gui we set the viewport back to the full
             // screen. 
             m_video_driver->setViewPort(core::recti(0, 0,
                 UserConfigParams::m_width,
                 UserConfigParams::m_height));
+
             for(unsigned int i=0; i<world->getNumKarts(); i++)
             {
                 Kart *kart = world->getKart(i);
diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index 47bed74dd..8a499f663 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -181,7 +181,6 @@ void RaceGUI::renderGlobal(float dt)
     
     KartIconDisplayInfo* info = world->getKartsDisplayInfo();
     
-    irr_driver->getVideoDriver()->enableMaterial2D(); // seems like we need to remind irrlicht from time to time to use the Material2D
     drawGlobalPlayerIcons(info);
 }   // renderGlobal
 
@@ -235,11 +234,8 @@ void RaceGUI::renderPlayerView(const Kart *kart)
 
     RaceGUI::KartIconDisplayInfo* info = World::getWorld()->getKartsDisplayInfo();
 
-    irr_driver->getVideoDriver()->enableMaterial2D(); // not sure why I need to call it again but with this, it works
     drawPowerupIcons    (kart, viewport, scaling);
-    irr_driver->getVideoDriver()->enableMaterial2D();
     drawSpeedAndEnergy  (kart, viewport, scaling);
-    irr_driver->getVideoDriver()->enableMaterial2D();
     drawRankLap         (info, kart, viewport);
 
     RaceGUIBase::renderPlayerView(kart);