Merge remote-tracking branch 'origin/master' into Importer

# Conflicts: # assets
2016-02-11 00:08:17 +01:00
parent 4b8f4981a3 c3cc5ae70b
commit 92e7d3ecf7
11 changed files with 74 additions and 33 deletions
@@ -9,8 +9,14 @@
    <Entity>
      <Components>
        <c:SceneLight/>
+        <c:Transform/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
        <c:Model>
-          <Resource>Models/Test/SplatMapTest.mesh</Resource>
+          <Resource>Models/Ground.mesh</Resource>
        </c:Model>
        <c:Transform/>
      </Components>