From b9e0d01c96493bc9ec68f193a4cbe4e994cf3369 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 24 Nov 2015 20:11:52 +0100 Subject: [PATCH] Merge with develop --- .../src/3d/driver/opengl/driver_opengl_pixel_program.cpp | 2 +- .../src/3d/driver/opengl/driver_opengl_vertex_program.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp index cbc427dab..dd66328e9 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp @@ -122,7 +122,7 @@ bool CDriverGL::compilePixelProgram(NL3D::CPixelProgram *program) { delete drvInfo; program->m_DrvInfo = NULL; - _GPUPrgDrvInfos.erase(it); + //_GPUPrgDrvInfos.erase(it); // not needed as ~IProgramDrvInfos() already does it return false; } } diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp index 22bc5ff5a..1c06ece9a 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp @@ -178,7 +178,7 @@ bool CDriverGL::compileNVVertexProgram(CVertexProgram *program) // Setup not ok delete drvInfo; program->m_DrvInfo = NULL; - _GPUPrgDrvInfos.erase(it); + //_GPUPrgDrvInfos.erase(it); // not needed as ~IProgramDrvInfos() already does it return false; } @@ -1568,7 +1568,7 @@ bool CDriverGL::compileARBVertexProgram(NL3D::CVertexProgram *program) { delete drvInfo; program->m_DrvInfo = NULL; - _GPUPrgDrvInfos.erase(it); + //_GPUPrgDrvInfos.erase(it); // not needed as ~IProgramDrvInfos() already does it return false; } @@ -1695,7 +1695,7 @@ bool CDriverGL::compileEXTVertexShader(CVertexProgram *program) { delete drvInfo; program->m_DrvInfo = NULL; - _GPUPrgDrvInfos.erase(it); + //_GPUPrgDrvInfos.erase(it); // not needed as ~IProgramDrvInfos() already does it return false; }