* Updated to ZDoom r3249:

- Moved R_AlignFlat out of renderer into main game code (r_ to p_.)
- Moved the code from r_data.cpp to some better fitting places and deleted this file and r_data.h because the remaining parts of it were just a random collection of unrelated functions.
- Updated CMakeLists.txt for last commit.
- Separated all voxel related resource maintenance code from r_things.cpp and r_data.cpp into its own file.
* Adapted GL files to #include changes.
* Added back GL-needed fields to FVoxel, FVoxeldef and FCanvasTexture.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1221 b0f79afe-0144-0410-b225-9a4edf0717df

src/r_main.cpp

@@ -52,6 +52,8 @@
 #include "r_3dfloors.h"
 #include "v_palette.h"
 #include "po_man.h"
+#include "st_start.h"
+#include "v_font.h"
 #include "resources/colormaps.h"
 //#include "gl/data/gl_data.h"
 #include "gl/gl_functions.h"
@@ -814,7 +816,12 @@ void R_Init ()
 {
 	atterm (R_Shutdown);
 
-	R_InitData ();
+	StartScreen->Progress();
+	V_InitFonts();
+	StartScreen->Progress();
+	R_InitColormaps ();
+	StartScreen->Progress();
+
 	gl_ParseDefs();
 	R_InitPointToAngle ();
 	R_InitTables ();
@@ -850,7 +857,22 @@ static void R_Shutdown ()
 	R_DeinitParticles();
 	R_DeinitTranslationTables();
 	R_DeinitPlanes();
-	R_DeinitData();
+	R_DeinitColormaps ();
+	FCanvasTextureInfo::EmptyList();
+
+	// Free openings
+	if (openings != NULL)
+	{
+		M_Free (openings);
+		openings = NULL;
+	}
+
+	// Free drawsegs
+	if (drawsegs != NULL)
+	{
+		M_Free (drawsegs);
+		drawsegs = NULL;
+	}
 }
 
 //==========================================================================