Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

This commit is contained in:
Lirusaito
2013-06-23 02:25:15 -04:00
68 changed files with 661 additions and 1039 deletions

View File

@@ -5999,7 +5999,7 @@ void LLPipeline::setRenderDebugFeatureControl(U32 bit, bool value)
}
else
{
gPipeline.mRenderDebugFeatureMask &= !bit;
gPipeline.mRenderDebugFeatureMask &= ~bit;
}
}