TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 00:24:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #584 from klaussilveira/master

Browse source 
Copy of PR #551 changed to target development.
This commit is contained in:
Daniel Buckmaster 2014-03-17 09:07:35 +11:00
commit 382569ccb5
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gui/buttons/guiIconButtonCtrl.cpp
View file

@ -230,7 +230,7 @@ void GuiIconButtonCtrl::renderButton( Point2I &offset, const RectI& updateRect )
bool highlight = mMouseOver; bool highlight = mMouseOver;
bool depressed = mDepressed; 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()); RectI boundsRect(offset, getExtent());

4
Engine/source/scene/sceneManager.cpp
View file

@ -156,9 +156,7 @@ void SceneManager::renderScene( ScenePassType passType, U32 objectMask )
{ {
// Store the camera state so if we lock, this will become the // Store the camera state so if we lock, this will become the
// locked state. // locked state.
smLockedDiffuseCamera = cameraState;
if( passType == SPT_Diffuse )
smLockedDiffuseCamera = cameraState;
} }
// Create the render state. // Create the render state.