Integrate C++11 branch into 5_1-new

This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
444 changed files with 19503 additions and 21007 deletions
+2 -2
View File
@@ -220,7 +220,7 @@ RageDisplay_GLES2::RageDisplay_GLES2()
FixLittleEndian();
// RageDisplay_GLES2_Helpers::Init();
g_pWind = NULL;
g_pWind = nullptr;
}
RString
@@ -735,7 +735,7 @@ void RageDisplay_Legacy::SetBlendMode( BlendMode mode )
{
glEnable(GL_BLEND);
if (glBlendEquation != NULL)
if (glBlendEquation != nullptr)
{
if (mode == BLEND_INVERT_DEST)
glBlendEquation( GL_FUNC_SUBTRACT );