From 1a094f2b514c47b16c01dd5c33060f84486706db Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 14 Nov 2014 09:03:41 -0800
Subject: [PATCH] reorder PhysicsWorld and EntityTree in Application

---
 interface/src/Application.cpp | 6 +++---
 interface/src/Application.h   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 5bfdd90c22..13582be5a7 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -152,14 +152,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
         _voxelImporter(),
         _importSucceded(false),
         _sharedVoxelSystem(TREE_SCALE, DEFAULT_MAX_VOXELS_PER_SYSTEM, &_clipboard),
+#ifdef USE_BULLET_PHYSICS
+        _physicsWorld(glm::vec3(0.0f)),
+#endif // USE_BULLET_PHYSICS
         _entities(true),
         _entityCollisionSystem(),
         _entityClipboardRenderer(false),
         _entityClipboard(),
         _wantToKillLocalVoxels(false),
-#ifdef USE_BULLET_PHYSICS
-        _physicsWorld(glm::vec3(0.0f)),
-#endif // USE_BULLET_PHYSICS
         _viewFrustum(),
         _lastQueriedViewFrustum(),
         _lastQueriedTime(usecTimestampNow()),
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 1d537503a9..7172003435 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -494,6 +494,10 @@ private:
     VoxelSystem _sharedVoxelSystem;
     ViewFrustum _sharedVoxelSystemViewFrustum;
 
+#ifdef USE_BULLET_PHYSICS
+    ThreadSafePhysicsWorld _physicsWorld;
+#endif // USE_BULLET_PHYSICS
+
     EntityTreeRenderer _entities;
     EntityCollisionSystem _entityCollisionSystem;
     EntityTreeRenderer _entityClipboardRenderer;
@@ -504,10 +508,6 @@ private:
 
     MetavoxelSystem _metavoxels;
 
-#ifdef USE_BULLET_PHYSICS
-    ThreadSafePhysicsWorld _physicsWorld;
-#endif // USE_BULLET_PHYSICS
-
     ViewFrustum _viewFrustum; // current state of view frustum, perspective, orientation, etc.
     ViewFrustum _lastQueriedViewFrustum; /// last view frustum used to query octree servers (voxels)
     ViewFrustum _displayViewFrustum;