Merge pull request AMarquez94#5 from AMarquez94/dev

MERGE: Dev into Master
albertoamo · May 8, 2018 · a2cdee9 · a2cdee9
2 parents 7430e83 + 2f52458
commit a2cdee9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/Bin/data/meshes/ mesh_tubocapsula.mesh → Bin/data/meshes/mesh_tubocapsula.mesh b/Bin/data/meshes/ mesh_tubocapsula.mesh → Bin/data/meshes/mesh_tubocapsula.mesh
diff --git a/Bin/data/scenes/milestone2_map_pre.scene b/Bin/data/scenes/milestone2_map_pre.scene
@@ -26,7 +26,7 @@
       "render":
       [
         {
-          "mesh": "data/meshes/ mesh_tubocapsula.mesh"
+          "mesh": "data/meshes/mesh_tubocapsula.mesh"
           ,
           "materials":
           [