Merge with develop

--HG--
branch : compatibility-develop

code/nel/tools/3d/plugin_max/nel_export/nel_export.cpp

@@ -243,7 +243,7 @@ extern HINSTANCE hInstance;
 static INT_PTR CALLBACK CNelExportDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	// Set locale to english
-	setlocale (LC_NUMERIC, "English");
+	setlocale (LC_NUMERIC, "C");
 
 	BOOL ret = TRUE;
 	switch (msg)

code/nel/tools/3d/plugin_max/nel_export/nel_export_node_properties.cpp

@@ -1823,7 +1823,7 @@ INT_PTR CALLBACK VertexProgramDialogCallBack (
 			for (uint vpId=0; vpId<VP_COUNT; vpId++)
 			{
 				// Create the dialog
-				currentParam->SubVPDlg[vpId] = CreateDialogParam (hInstance, MAKEINTRESOURCE(SubVPTab[vpId]), hwndDlg, SubVPProc[vpId], (LONG)lParam);
+				currentParam->SubVPDlg[vpId] = CreateDialogParam (hInstance, MAKEINTRESOURCE(SubVPTab[vpId]), hwndDlg, SubVPProc[vpId], lParam);
 
 				// To client coord
 				RECT client = tabRect;
@@ -2526,7 +2526,7 @@ INT_PTR CALLBACK LodDialogCallback (
 				SendMessage (GetDlgItem (hwndDlg, IDC_TAB), TCM_INSERTITEM, SendMessage (GetDlgItem (hwndDlg, IDC_TAB), TCM_GETITEMCOUNT, 0, 0), (LPARAM)&tabItem);
 
 				// Create the dialog
-				currentParam->SubDlg[tab] = CreateDialogParam (hInstance, MAKEINTRESOURCE(SubTab[tab]), GetDlgItem (hwndDlg, IDC_TAB), SubProc[tab], (LONG)lParam);
+				currentParam->SubDlg[tab] = CreateDialogParam (hInstance, MAKEINTRESOURCE(SubTab[tab]), GetDlgItem (hwndDlg, IDC_TAB), SubProc[tab], lParam);
 
 				// To client coord
 				RECT client = tabRect;

code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp

@@ -1098,7 +1098,7 @@ static std::string OldDecimalSeparatorLocale;
 static void setDecimalSeparatorAsPoint()
 {
 	OldDecimalSeparatorLocale = ::setlocale(LC_NUMERIC, NULL);
-	::setlocale(LC_NUMERIC, "English");	
+	::setlocale(LC_NUMERIC, "C");
 }
 
 static void restoreDecimalSeparator()

code/nel/tools/3d/plugin_max/nel_patch_paint/paint.cpp

@@ -3522,7 +3522,7 @@ void EPM_PaintCMode::DoPaint ()
 	static float best = 10000.f;
 
 	// Set local to english
-	setlocale (LC_NUMERIC, "English");
+	setlocale (LC_NUMERIC, "C");
 
 	if (pobj->hOpsPanel)
 	{