From ccdfb11de2e3ae33d3b563650cc0299034e89ad6 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed, 11 Sep 2019 16:56:29 -0700
Subject: [PATCH] Re-order hfm::Model variables and add shapeTransforms list

---
 libraries/hfm/src/hfm/HFM.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/hfm/src/hfm/HFM.h b/libraries/hfm/src/hfm/HFM.h
index b49e53ad4c..33b02819d2 100644
--- a/libraries/hfm/src/hfm/HFM.h
+++ b/libraries/hfm/src/hfm/HFM.h
@@ -315,14 +315,14 @@ public:
     std::vector<Shape> shapes;
 
     std::vector<Mesh> meshes;
+    std::vector<Material> materials;
+    std::vector<ShapeTransform> shapeTransforms;
 
     std::vector<Joint> joints;
     QHash<QString, int> jointIndices; ///< 1-based, so as to more easily detect missing indices
     bool hasSkeletonJoints;
     QVector<QString> scripts;
 
-    std::vector<Material> materials;
-
     glm::mat4 offset; // This includes offset, rotation, and scale as specified by the FST file
 
     glm::vec3 neckPivot;