From 0fde3a2d76f59bbbedfc6574d5ccf52ab3ffa9db Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Tue, 13 Sep 2016 10:26:38 -0700 Subject: [PATCH] Fix for TRUNCATE_IK_CAPSULE globals --- interface/src/avatar/MyAvatar.cpp | 6 +++--- interface/src/avatar/SkeletonModel.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 01e749b7b2..38d84fdd53 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -86,9 +86,9 @@ const float MyAvatar::ZOOM_DEFAULT = 1.5f; extern bool OUTOFBODY_HACK_ENABLE_DEBUG_DRAW_IK_TARGETS; // OUTOFBODY_HACK defined in SkeletonModel.cpp -extern const glm::vec3 TRUNCATE_IK_CAPSULE_POSITION; -extern const float TRUNCATE_IK_CAPSULE_LENGTH; -extern const float TRUNCATE_IK_CAPSULE_RADIUS; +extern glm::vec3 TRUNCATE_IK_CAPSULE_POSITION; +extern float TRUNCATE_IK_CAPSULE_LENGTH; +extern float TRUNCATE_IK_CAPSULE_RADIUS; MyAvatar::MyAvatar(RigPointer rig) : Avatar(rig), diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp index be1d071f6b..b36da765e5 100644 --- a/interface/src/avatar/SkeletonModel.cpp +++ b/interface/src/avatar/SkeletonModel.cpp @@ -23,9 +23,9 @@ #include "InterfaceLogging.h" #include "AnimDebugDraw.h" -const glm::vec3 TRUNCATE_IK_CAPSULE_POSITION(0.0f, 0.0f, 0.0f); -const float TRUNCATE_IK_CAPSULE_LENGTH = 1000.0f; -const float TRUNCATE_IK_CAPSULE_RADIUS = 0.5f; +glm::vec3 TRUNCATE_IK_CAPSULE_POSITION(0.0f, 0.0f, 0.0f); +float TRUNCATE_IK_CAPSULE_LENGTH = 1000.0f; +float TRUNCATE_IK_CAPSULE_RADIUS = 0.5f; SkeletonModel::SkeletonModel(Avatar* owningAvatar, QObject* parent, RigPointer rig) : Model(rig, parent),