Merge pull request #1800 from Azaezel/andOrMaybe

clang reports: unclear || + && and &+| mixes.
This commit is contained in:
Anis 2017-01-07 02:31:05 +01:00 committed by GitHub
commit 55b7a8431c
16 changed files with 37 additions and 35 deletions

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 )