Merge pull request #3766 from Atlante45/corruption_bug

Switch members in EntityItemProperties to hack around corruption bug
This commit is contained in:
Brad Hefta-Gaub 2014-11-10 10:40:16 -08:00
commit 70c7a2e040

View file

@ -383,8 +383,8 @@ private:
// NOTE: The following are pseudo client only properties. They are only used in clients which can access
// properties of model geometry. But these properties are not serialized like other properties.
QVector<SittingPoint> _sittingPoints;
glm::vec3 _naturalDimensions;
QStringList _textureNames;
glm::vec3 _naturalDimensions;
};
Q_DECLARE_METATYPE(EntityItemProperties);
QScriptValue EntityItemPropertiesToScriptValue(QScriptEngine* engine, const EntityItemProperties& properties);