Merge pull request #584 from klaussilveira/master

Copy of PR #551 changed to target development.

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 );
-}
+}

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.