]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
quick fix
authorLockedLunatic <locked.lunatic@aon.at>
Mon, 13 Apr 2015 16:32:07 +0000 (18:32 +0200)
committerLockedLunatic <locked.lunatic@aon.at>
Mon, 13 Apr 2015 16:32:07 +0000 (18:32 +0200)
Weave/Game.cpp
models/level_test.blend
models/level_test.blend1
models/level_test.dae

index 197e1b2fb181f914cd91fc2fa1acfce7cb5cb905..cccf0cbe4ad61950e922917ba0ffabd621134425 100644 (file)
@@ -177,7 +177,7 @@ bool Game::import(const string& path, Scene& scene, Shader* shader)
 {
        Assimp::Importer importer;
 
-       const aiScene* file = importer.ReadFile("../models/" + path, aiProcess_GenUVCoords | aiProcess_Triangulate | aiProcess_JoinIdenticalVertices | aiProcess_SortByPType | aiProcess_PreTransformVertices);
+       const aiScene* file = importer.ReadFile("../models/" + path, aiProcess_GenUVCoords | aiProcess_Triangulate | aiProcess_JoinIdenticalVertices);
        if (!file)
        {
                Message::error("The file " + path + " couldn't be read.\n" + importer.GetErrorString());
index 71cc478b5ff8a7695d8eed21470891efddc3e7a8..58395e2eb49b6a3ebebf2abdc579d4afa78a4350 100644 (file)
Binary files a/models/level_test.blend and b/models/level_test.blend differ
index e40dc9cfa0e5c36431d53b24474bdbb8cf20e96a..9998c4c042967abe43d28299690c6d10205b464d 100644 (file)
Binary files a/models/level_test.blend1 and b/models/level_test.blend1 differ
index 45ae8c6d1c1858a30ce64d234748301b03fb76e5..9178317872588e8cd1e054f3721e72f507f58c0a 100644 (file)
@@ -5,8 +5,8 @@
       <author>Blender User</author>
       <authoring_tool>Blender 2.70.0 commit date:2014-04-10, commit time:11:49, hash:f93bc76</authoring_tool>
     </contributor>
-    <created>2015-04-13T16:48:33</created>
-    <modified>2015-04-13T16:48:33</modified>
+    <created>2015-04-13T18:07:00</created>
+    <modified>2015-04-13T18:07:00</modified>
     <unit name="meter" meter="1"/>
     <up_axis>Z_UP</up_axis>
   </asset>