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

Merge branch 'development' of github.com:GarageGames/Torque3D

Browse source
This commit is contained in:
Thomas "elfprince13" Dickerson 2017-01-06 22:52:04 -05:00
commit e2c61e1eb4
56 changed files with 317 additions and 8496 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gui/containers/guiRolloutCtrl.cpp
View file

@ -188,7 +188,7 @@ bool GuiRolloutCtrl::_onMouseUp( const GuiEvent &event, bool lockedMouse )
{
// If Ctrl/Cmd-clicking a header, collapse all sibling GuiRolloutCtrls.
if( ( mAutoCollapseSiblings && !mIsExpanded && !( event.modifier & SI_PRIMARY_CTRL )
if( (( mAutoCollapseSiblings && !mIsExpanded && !( event.modifier & SI_PRIMARY_CTRL ))
|| ( !mAutoCollapseSiblings && event.modifier & SI_PRIMARY_CTRL ) ) )
{
for( SimSet::iterator iter = getParent()->begin(); iter != getParent()->end(); ++ iter )