From c85b809e0497641949ea82aa9ae6e8bb7a36aea1 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Mon, 5 Nov 2018 13:40:38 -0800
Subject: [PATCH] Fix Qt metatypes breaking by moving them back out of the hfm
 namespace

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

diff --git a/libraries/hfm/src/HFM.h b/libraries/hfm/src/HFM.h
index 8aeba04131..dd5250ca83 100644
--- a/libraries/hfm/src/HFM.h
+++ b/libraries/hfm/src/HFM.h
@@ -258,9 +258,6 @@ public:
     QVector<glm::vec3> translations;
 };
 
-Q_DECLARE_METATYPE(AnimationFrame)
-Q_DECLARE_METATYPE(QVector<AnimationFrame>)
-
 /// A light.
 class Light {
 public:
@@ -342,9 +339,6 @@ public:
     QList<QString> blendshapeChannelNames;
 };
 
-Q_DECLARE_METATYPE(Model)
-Q_DECLARE_METATYPE(Model::Pointer)
-
 };
 
 class ExtractedMesh {
@@ -356,4 +350,10 @@ public:
     QHash<QString, size_t> texcoordSetMap;
 };
 
+Q_DECLARE_METATYPE(HFMAnimationFrame)
+Q_DECLARE_METATYPE(QVector<HFMAnimationFrame>)
+
+Q_DECLARE_METATYPE(HFMModel)
+Q_DECLARE_METATYPE(HFMModel::Pointer)
+
 #endif // hifi_HFM_h_