From 0d610b7aac224af647d692b2587e4d8eeac968ee Mon Sep 17 00:00:00 2001
From: Klaus Silveira <contact@klaussilveira.com>
Date: Sun, 8 Dec 2013 01:19:42 -0200
Subject: [PATCH 1/2] Fixed missing check for highlighted font color on GUI
 icon button

---
 Engine/source/gui/buttons/guiIconButtonCtrl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Engine/source/gui/buttons/guiIconButtonCtrl.cpp b/Engine/source/gui/buttons/guiIconButtonCtrl.cpp
index 55a0efb16..b4aed4ec7 100644
--- a/Engine/source/gui/buttons/guiIconButtonCtrl.cpp
+++ b/Engine/source/gui/buttons/guiIconButtonCtrl.cpp
@@ -230,7 +230,7 @@ void GuiIconButtonCtrl::renderButton( Point2I &offset, const RectI& updateRect )
    bool highlight = mMouseOver;
    bool depressed = mDepressed;
    
-   ColorI fontColor   = mActive ? (highlight ? mProfile->mFontColor : mProfile->mFontColor) : mProfile->mFontColorNA;
+   ColorI fontColor   = mActive ? (highlight ? mProfile->mFontColorHL : mProfile->mFontColor) : mProfile->mFontColorNA;
    
    RectI boundsRect(offset, getExtent());
 
@@ -436,4 +436,4 @@ DefineEngineMethod( GuiIconButtonCtrl, setBitmap, void, (const char* buttonFilen
    char* argBuffer = Con::getArgBuffer( 512 );
    Platform::makeFullPathName( buttonFilename, argBuffer, 512 );
    object->setBitmap( argBuffer );
-}
\ No newline at end of file
+}

From 55cb5a6752bd079f5e4117ad78649fdc274afb57 Mon Sep 17 00:00:00 2001
From: Klaus Silveira <contact@klaussilveira.com>
Date: Sun, 8 Dec 2013 01:23:24 -0200
Subject: [PATCH 2/2] Removed redundant check

---
 Engine/source/scene/sceneManager.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Engine/source/scene/sceneManager.cpp b/Engine/source/scene/sceneManager.cpp
index 3fcd37422..fa6721ac7 100644
--- a/Engine/source/scene/sceneManager.cpp
+++ b/Engine/source/scene/sceneManager.cpp
@@ -156,9 +156,7 @@ void SceneManager::renderScene( ScenePassType passType, U32 objectMask )
    {
       // Store the camera state so if we lock, this will become the
       // locked state.
-
-      if( passType == SPT_Diffuse )
-         smLockedDiffuseCamera = cameraState;
+      smLockedDiffuseCamera = cameraState;
    }
    
    // Create the render state.