From bb5d061d782fbfc8db9c541f9a0176ad0b39927e Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Fri, 4 Sep 2015 16:17:35 -0700 Subject: [PATCH] linux and mac compile fixes. Removed "friend MyAvatar" from Rig and JointState. This was only there for debugging, but I accidentally committed it. --- libraries/animation/src/JointState.h | 2 -- libraries/animation/src/Rig.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/libraries/animation/src/JointState.h b/libraries/animation/src/JointState.h index 1fa7576b74..4f45661eb2 100644 --- a/libraries/animation/src/JointState.h +++ b/libraries/animation/src/JointState.h @@ -26,8 +26,6 @@ class AngularConstraint; class JointState { public: - friend class MyAvatar; - JointState() {} JointState(const JointState& other) { copyState(other); } JointState(const FBXJoint& joint); diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h index 4d37dc92e6..254d708eaa 100644 --- a/libraries/animation/src/Rig.h +++ b/libraries/animation/src/Rig.h @@ -50,9 +50,6 @@ class Rig; typedef std::shared_ptr RigPointer; class Rig : public QObject, public std::enable_shared_from_this { - - friend MyAvatar; - public: struct HeadParameters {