From df78f895a67f810357766082ff103c912c39110a Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Tue, 22 Dec 2015 14:53:18 -0800
Subject: [PATCH] Reorder RenderContext initializer to avoid -Wreorder

---
 libraries/render/src/render/Engine.cpp | 7 ++++---
 libraries/render/src/render/Engine.h   | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libraries/render/src/render/Engine.cpp b/libraries/render/src/render/Engine.cpp
index c38ceda034..907c836347 100644
--- a/libraries/render/src/render/Engine.cpp
+++ b/libraries/render/src/render/Engine.cpp
@@ -14,9 +14,10 @@
 using namespace render;
 
 RenderContext::RenderContext(ItemsConfig items, Tone tone, int drawStatus, bool drawHitEffect, glm::vec4 deferredDebugSize, int deferredDebugMode)
-        : _args{ nullptr }, _items{ items }, _tone{ tone },
-        _drawStatus{ drawStatus }, _drawHitEffect{ drawHitEffect },
-        _deferredDebugSize{ deferredDebugSize }, _deferredDebugMode{ deferredDebugMode } {};
+    : _deferredDebugMode{ deferredDebugMode }, _deferredDebugSize{ deferredDebugSize },
+    _args{ nullptr },
+    _drawStatus{ drawStatus }, _drawHitEffect{ drawHitEffect },
+    _items{ items }, _tone{ tone } {}
 
 void RenderContext::setOptions(bool occlusion, bool fxaa, bool showOwned) {
     _occlusionStatus = occlusion;
diff --git a/libraries/render/src/render/Engine.h b/libraries/render/src/render/Engine.h
index 02f3bf3b2c..4192dd3ed9 100644
--- a/libraries/render/src/render/Engine.h
+++ b/libraries/render/src/render/Engine.h
@@ -91,15 +91,15 @@ public:
     void setOptions(bool occlusion, bool fxaa, bool showOwned);
 
     // Debugging
-    int _deferredDebugMode = -1;
-    glm::vec4 _deferredDebugSize { 0.0f, -1.0f, 1.0f, 1.0f };
+    int _deferredDebugMode;
+    glm::vec4 _deferredDebugSize;
 
 protected:
     RenderArgs* _args;
 
     // Options
-    int _drawStatus = 0; // bitflag
-    bool _drawHitEffect = false;
+    int _drawStatus; // bitflag
+    bool _drawHitEffect;
     bool _occlusionStatus = false;
     bool _fxaaStatus = false;