From a124ab24004cc3f9a2891c561f9617f04e9723f8 Mon Sep 17 00:00:00 2001
From: Tleety <dahltobbe@hotmail.com>
Date: Tue, 19 Jan 2016 16:11:56 +0100
Subject: [PATCH] Some asset shit.

Fixed testworld to use the right model.
---
 assets                                        | 2 +-
 resources/Schema/Entities/EditorTestWorld.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets b/assets
index 187bc629..6ffb46e1 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 187bc62969fd753216441a12b179f520ce5c6b05
+Subproject commit 6ffb46e155c8f013241cd1507098c94900ec2448
diff --git a/resources/Schema/Entities/EditorTestWorld.xml b/resources/Schema/Entities/EditorTestWorld.xml
index 733e643b..2e95d626 100755
--- a/resources/Schema/Entities/EditorTestWorld.xml
+++ b/resources/Schema/Entities/EditorTestWorld.xml
@@ -49,7 +49,7 @@
         <c:Listener/>
         <c:Transform>
           <Position X="1.36896265" Y="4.4259491" Z="10.6640663"/>
-          <Orientation X="-0.0349078104" Y="0.157154545" Z="-2.60020244e-07"/>
+          <Orientation X="-0.0349078141" Y="0.157154545" Z="-2.60252193e-07"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -80,7 +80,7 @@
         <Entity>
           <Components>
             <c:Model>
-              <Resource>Models/SecondaryWeapon4.fbx</Resource>
+              <Resource>Models/SecondaryWeapon.fbx</Resource>
             </c:Model>
             <c:Transform>
               <Position X="-0.546139359" Y="0.853016734" Z="0.177482292"/>