From 98a7e4e7110996ea972d0b859af7eb9783502b24 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Mon, 22 Apr 2019 11:34:58 -0700
Subject: [PATCH] fix version not being preserved

---
 tools/oven/src/DomainBaker.cpp | 14 ++++----------
 tools/oven/src/DomainBaker.h   |  2 ++
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/tools/oven/src/DomainBaker.cpp b/tools/oven/src/DomainBaker.cpp
index b6adee28dc..fc065619d7 100644
--- a/tools/oven/src/DomainBaker.cpp
+++ b/tools/oven/src/DomainBaker.cpp
@@ -15,7 +15,6 @@
 #include <QtCore/QEventLoop>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
-#include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
 #include "Gzip.h"
@@ -132,10 +131,10 @@ void DomainBaker::loadLocalFile() {
     }
 
     // read the file contents to a JSON document
-    auto jsonDocument = QJsonDocument::fromJson(fileContents);
+    _json = QJsonDocument::fromJson(fileContents);
 
     // grab the entities object from the root JSON object
-    _entities = jsonDocument.object()[ENTITIES_OBJECT_KEY].toArray();
+    _entities = _json.object()[ENTITIES_OBJECT_KEY].toArray();
 
     if (_entities.isEmpty()) {
         // add an error to our list stating that the models file was empty
@@ -749,15 +748,10 @@ void DomainBaker::writeNewEntitiesFile() {
     // time to write out a main models.json.gz file
 
     // first setup a document with the entities array below the entities key
-    QJsonDocument entitiesDocument;
-
-    QJsonObject rootObject;
-    rootObject[ENTITIES_OBJECT_KEY] = _entities;
-
-    entitiesDocument.setObject(rootObject);
+    _json.object()[ENTITIES_OBJECT_KEY] = _entities;
 
     // turn that QJsonDocument into a byte array ready for compression
-    QByteArray jsonByteArray = entitiesDocument.toJson();
+    QByteArray jsonByteArray = _json.toJson();
 
     // compress the json byte array using gzip
     QByteArray compressedJson;
diff --git a/tools/oven/src/DomainBaker.h b/tools/oven/src/DomainBaker.h
index e8102ec7e8..d4414bbf99 100644
--- a/tools/oven/src/DomainBaker.h
+++ b/tools/oven/src/DomainBaker.h
@@ -12,6 +12,7 @@
 #ifndef hifi_DomainBaker_h
 #define hifi_DomainBaker_h
 
+#include <QtCore/QJsonDocument>
 #include <QtCore/QJsonArray>
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
@@ -59,6 +60,7 @@ private:
     QString _originalOutputPath;
     QUrl _destinationPath;
 
+    QJsonDocument _json;
     QJsonArray _entities;
 
     QHash<QUrl, QSharedPointer<ModelBaker>> _modelBakers;