Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-24 11:16:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix ScriptAvatar promotion of AvatarData

Browse source
This commit is contained in:
Stephen Birarda 2017-04-10 22:03:21 -07:00 committed by Zach Fox
parent b8620f6919
commit db6fc40277
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/AvatarManager.h
View file

@ -44,7 +44,7 @@ public:
std::shared_ptr<MyAvatar> getMyAvatar() { return _myAvatar; }
// Null/Default-constructed QUuids will return MyAvatar
Q_INVOKABLE virtual ScriptAvatar* getAvatar(QUuid avatarID) override { return new ScriptAvatar(getAvatarBySessionID(avatarID)); }
Q_INVOKABLE virtual ScriptAvatarData* getAvatar(QUuid avatarID) override { return new ScriptAvatar(getAvatarBySessionID(avatarID)); }
AvatarSharedPointer getAvatarBySessionID(const QUuid& sessionID) const override;

2
interface/src/avatar/ScriptAvatar.h
View file

@ -51,8 +51,6 @@ public slots:
private:
std::shared_ptr<Avatar> lockAvatar() const;
std::weak_ptr<AvatarData> _avatarData;
};
#endif // hifi_ScriptAvatar_h

2
libraries/avatars/src/ScriptAvatarData.h
View file

@ -131,7 +131,7 @@ public slots:
glm::quat getAbsoluteJointRotationInObjectFrame(int index) const;
glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const;
private:
protected:
std::weak_ptr<AvatarData> _avatarData;
};