Merge branch 'tessallation'

COMPILING

@@ -1,6 +1,13 @@
+# on ubuntu14.04 (trusty) and later
+
+just run 
+> ./build.sh
+
+# manual installation
+
 set up external dependencies:
 
-> sudo apt-get install libsdl2-dev
+> sudo apt-get install libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev libsdl2-mixer-dev
 > cd deps && ./getDeps.sh && cd ..
 
 NOTE: ubuntu saucy currently only has libsdl2-dev.2.0.0 in the repositories, but we need libsdl2-dev.2.0.1
@@ -12,8 +19,8 @@ make sure the compiled files are in your PATH (e.g. include $HOME/.cabal/bin in
 
 install dependencies & configure app
 > cabal sandbox init
-> cabal sandbox --add-source deps/hsSDL2
-> cabal sandbox --add-source deps/hsSDL2-ttf
+> cabal sandbox add-source deps/hsSDL2
+> cabal sandbox add-source deps/hsSDL2-ttf
 > cabal install --only-dependencies
 > cabal configure
 

src/Render/Render.hs

@@ -389,10 +389,6 @@ render = do
 
         glDrawArrays gl_PATCHES 0 (fromIntegral numVert)
 
-
-	currentProgram $= Just (state ^. gl.glMap.objectProgram)
-	
-
         checkError "draw map"
 
 	---- RENDER MAPOBJECTS --------------------------------------------