From 621d62cdf8bc89a5e8f8b3a646ec13deb07f1878 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Thu, 6 Oct 2016 09:53:12 -0700
Subject: [PATCH] Merge and fix the linux warning

---
 libraries/gpu/src/gpu/Buffer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/gpu/src/gpu/Buffer.cpp b/libraries/gpu/src/gpu/Buffer.cpp
index fb60e0e737..018788365d 100644
--- a/libraries/gpu/src/gpu/Buffer.cpp
+++ b/libraries/gpu/src/gpu/Buffer.cpp
@@ -42,8 +42,8 @@ Buffer::Size Buffer::getBufferGPUMemoryUsage() {
 }
 
 Buffer::Buffer(Size pageSize) :
-    _pages(pageSize),
-    _renderPages(pageSize) {
+    _renderPages(pageSize),
+    _pages(pageSize) {
     _bufferCPUCount++;
 }