Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-17 07:32:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Qt metatypes breaking by moving them back out of the hfm namespace

Browse source
This commit is contained in:
sabrina-shanman 2018-11-05 13:40:38 -08:00
parent a98a9b1c0c
commit c85b809e04
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/hfm/src/HFM.h
View file

@ -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_