Merge pull request #405 from raven02/g3d-log

Add disable G3D log to option menu , make default false

Core/Config.cpp

@@ -66,6 +66,7 @@ void CConfig::Load(const char *iniFileName)
 	graphics->Get("LinearFiltering", &bLinearFiltering, false);
 	graphics->Get("SSAA", &SSAntiAlaising, 0);
 	graphics->Get("VBO", &bUseVBO, true);
+	graphics->Get("DisableG3DLog", &bDisableG3DLog, false);
 
 	IniFile::Section *sound = iniFile.GetOrCreateSection("Sound");
 	sound->Get("Enable", &bEnableSound, true);
@@ -107,6 +108,7 @@ void CConfig::Save()
 		graphics->Set("LinearFiltering", bLinearFiltering);
 		graphics->Set("SSAA", SSAntiAlaising);
 		graphics->Set("VBO", bUseVBO);
+		graphics->Set("DisableG3DLog", bDisableG3DLog);
 
 		IniFile::Section *sound = iniFile.GetOrCreateSection("Sound");
 		sound->Set("Enable", bEnableSound);

GPU/GLES/VertexShaderGenerator.cpp

@@ -338,7 +338,7 @@ void GenerateVertexShader(int prim, char *buffer) {
 			if (hasColor) {
 				WRITE(p, "  v_color0 = a_color0;\n");
 			} else {
-				WRITE(p, "  v_color0 += vec4(u_matambientalpha.rgb, 0.0);\n");
+				WRITE(p, "  v_color0 = u_matambientalpha;\n");
 			}
 			if (lmode)
 				WRITE(p, "  v_color1 = vec3(0.0, 0.0, 0.0);\n");

Windows/WndMainWindow.cpp

@@ -480,6 +480,7 @@ namespace MainWindow
 					SetZoom(screenfactor);
 					_ViewFullScreen(hWnd);
 				}
+				UpdateMenus();
 				break;
 
 			case ID_OPTIONS_WIREFRAME: