Moved material loading from render to core, make sure the dedicated server reads materials.ini,

removed unnecessary CollisionMesh::translate() method.

1 files changed, 13 insertions, 1 deletions

diff --git a/src/client/video.cc b/src/client/video.cc
index 84bbe52..2949ae7 100644
--- a/src/client/video.cc
+++ b/src/client/video.cc
@@ -227,7 +227,7 @@ bool init()
 
 	// initialize renderer
 	render::init(width,  height);
-
+	
 	// apply render options
 	ui::root()->load_settings();
 
@@ -267,10 +267,22 @@ void resize(int w, int h)
 void restart()
 {
 	shutdown();
+	
+	// clear models and materials	
+	/* resetting the rednder subsystem will force a reload of all materials
+	 */
+	model::Model::clear();
+	
+	model::Material::clear();
+		
 	if (!init()) {
 		client()->quit(1);
 	}
+	
+	model::Material::init();
 
+	render::load();
+	
 	input::reset();
 }