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

@ -99,7 +99,7 @@ void GFXGLStateBlock::activate(const GFXGLStateBlock* oldState)
#define STATE_CHANGE(state) (!oldState || oldState->mDesc.state != mDesc.state)
#define TOGGLE_STATE(state, enum) if(mDesc.state) glEnable(enum); else glDisable(enum)
#define CHECK_TOGGLE_STATE(state, enum) if(!oldState || oldState->mDesc.state != mDesc.state) if(mDesc.state) glEnable(enum); else glDisable(enum)
#define CHECK_TOGGLE_STATE(state, enum) if(!oldState || oldState->mDesc.state != mDesc.state) {if(mDesc.state) glEnable(enum); else glDisable(enum);}
// Blending
CHECK_TOGGLE_STATE(blendEnable, GL_BLEND);