mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 04:37:48 +02:00
Merge pull request #7047 from AndrewMeadows/hide-the-razor-blades
MyAVatar::rebuildCollisionShape() is not a slot
This commit is contained in:
commit
aa3cb8fb20
1 changed files with 2 additions and 2 deletions
|
@ -240,6 +240,8 @@ public:
|
||||||
glm::quat getCustomListenOrientation() { return _customListenOrientation; }
|
glm::quat getCustomListenOrientation() { return _customListenOrientation; }
|
||||||
void setCustomListenOrientation(glm::quat customListenOrientation) { _customListenOrientation = customListenOrientation; }
|
void setCustomListenOrientation(glm::quat customListenOrientation) { _customListenOrientation = customListenOrientation; }
|
||||||
|
|
||||||
|
virtual void rebuildCollisionShape() override;
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void increaseSize();
|
void increaseSize();
|
||||||
void decreaseSize();
|
void decreaseSize();
|
||||||
|
@ -256,8 +258,6 @@ public slots:
|
||||||
|
|
||||||
Q_INVOKABLE void updateMotionBehaviorFromMenu();
|
Q_INVOKABLE void updateMotionBehaviorFromMenu();
|
||||||
|
|
||||||
virtual void rebuildCollisionShape() override;
|
|
||||||
|
|
||||||
Q_INVOKABLE QUrl getAnimGraphUrl() const { return _animGraphUrl; }
|
Q_INVOKABLE QUrl getAnimGraphUrl() const { return _animGraphUrl; }
|
||||||
|
|
||||||
void setEnableDebugDrawDefaultPose(bool isEnabled);
|
void setEnableDebugDrawDefaultPose(bool isEnabled);
|
||||||
|
|
Loading…
Reference in a new issue