Merge branch 'master' into win32

Conflicts:
	gui.h
	quadtree.cpp
	scene.cpp
	scene.h

1 files changed, 5 insertions, 4 deletions

diff --git a/scene.h b/scene.h
index 3131474..e700351 100644
--- a/scene.h
+++ b/scene.h
@@ -2,7 +2,7 @@
 #define SCENE_H
 
 #include "vector.h"
-#include "quadtree.h"
+#include "terrain.h"
 #include "gl.h"
 #include "shader.h"
 #include "gui.h"
@@ -15,18 +15,19 @@ class Scene {
 		float pitch, yaw;
 		Vector3 pos;
 		float yvel;
-		Quadtree *qt;
+		Terrain *terrain;
 		//FTFont *font;
 		GUI *gui;
 		Tool *tool;
 
 		bool running;
 		bool grid;
-		bool terrain;
+		bool normals;
+		bool render_terrain;
 		bool gravity;
 		bool dialog;
 
-		Quadtree::QuadNode *last_node;
+		Terrain::Node *last_node;
 
 		unsigned int last_time;
 		Vector3 selected;