From 431421c7e626b50186fc54542db3967cde844a66 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Thu, 25 Aug 2011 22:04:42 +0000
Subject: OBJ model support, by Thorn

---
 src/model/model.cc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/model/model.cc')

diff --git a/src/model/model.cc b/src/model/model.cc
index ab89dae..776eba7 100644
--- a/src/model/model.cc
+++ b/src/model/model.cc
@@ -8,6 +8,7 @@
 #include "model/model.h"
 #include "model/asefile.h"
 #include "model/mapfile.h"
+#include "model/objfile.h"
 #include "model/vertexarray.h"
 
 namespace model
@@ -138,6 +139,11 @@ Model *Model::load(const std::string & name)
 		// if it can't be found, try the ase model
 		model = ASEFile::load(name);
 	}
+	
+	if (!model) {
+		// if it can't be found, try the obj model
+		model = OBJFile::load(name);
+	}
 
 	if (!model) {
 		con_warn << "Could not open model " << name << std::endl;
-- 
cgit v1.2.3