Merge with develop

--HG--
branch : feature-material-editor

code/nel/include/nel/misc/bitmap.h

@@ -320,16 +320,8 @@ public:
 
 	// don't forget to update operator=() and swap() if adding a data member
 
-	CBitmap()
-	{
-		_MipMapCount = 1;
-		_Width = 0;
-		_Height = 0;
-		PixelFormat = RGBA;
-		_LoadGrayscaleAsAlpha = true;
-	}
-
-	virtual ~CBitmap() { }
+	CBitmap();
+	virtual ~CBitmap();
 
 	// swap 2 bitmaps contents
 	void	swap(CBitmap &other);

code/nel/src/3d/driver/opengl/driver_opengl_window.cpp

@@ -1629,7 +1629,7 @@ bool CDriverGL::destroyWindow()
 	if (_hDC)
 		wglMakeCurrent(_hDC, NULL);
 
-	if (_DestroyWindow && _hRC)
+	if (_hRC)
 	{
 		wglDeleteContext(_hRC);
 		_hRC = NULL;
@@ -1644,7 +1644,7 @@ bool CDriverGL::destroyWindow()
 #elif defined(NL_OS_MAC)
 #elif defined(NL_OS_UNIX)
 
-	if (_DestroyWindow && _ctx)
+	if (_DestroyWindow && _ctx) // FIXME: _DestroyWindow may need to be removed here as well
 		glXDestroyContext(_dpy, _ctx);
 
 	_ctx = NULL;

code/nel/src/misc/bitmap.cpp

@@ -84,6 +84,20 @@ void MakeWhite(CBitmap &bitmaps)
 }
 #endif // NEL_ALL_BITMAP_WHITE
 
+CBitmap::CBitmap()
+{
+	_MipMapCount = 1;
+	_Width = 0;
+	_Height = 0;
+	PixelFormat = RGBA;
+	_LoadGrayscaleAsAlpha = true;
+}
+
+CBitmap::~CBitmap()
+{
+
+}
+
 /*-------------------------------------------------------------------*\
 								load
 \*-------------------------------------------------------------------*/