sane version number,

conditional definition of missing OpenGL defines on win32,
updated planet collision warning message,
removed material loader debug messages

2 files changed, 11 insertions, 1 deletions

diff --git a/src/render/gl.h b/src/render/gl.h
index c8e51eb..dc0b5a1 100644
--- a/src/render/gl.h
+++ b/src/render/gl.h
@@ -16,11 +16,21 @@
 #include "math/color.h"
 
 #ifdef _WIN32
+
+#ifndef GL_RESCALE_NORMAL
 #define GL_RESCALE_NORMAL                 0x803A
+#endif
+
+#ifndef GL_TEXTURE_MAX_LEVEL
 #define GL_TEXTURE_MAX_LEVEL              0x813D
+#endif
+
+#ifndef GL_GENERATE_MIPMAP
 #define GL_GENERATE_MIPMAP                0x8191
 #endif
 
+#endif
+
 /// wrapper namespace for OpenGL operations
 /** The gl namespace provides a wrapper to the OpenGL library functions.
  *  All methods take floats or Vector3f and Color as parameters.
diff --git a/src/render/render.cc b/src/render/render.cc
index fbeec11..0c7b35d 100644
--- a/src/render/render.cc
+++ b/src/render/render.cc
@@ -74,7 +74,7 @@ void init(int width, int height)
 	model::Material::init();
 
 	// size of the vertex array in megabytes
-	r_arraysize = core::Cvar::get("r_arraysize", 0.0f , core::Cvar::Archive);
+	r_arraysize = core::Cvar::get("r_arraysize", 64.0f , core::Cvar::Archive);
 	r_arraysize->set_info("[int] size of the vertex array in Mb");
 
 	size_t mb = (size_t) r_arraysize->value();