diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 0e2625bf0f..de2459d9ee 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1002,7 +1002,6 @@ void MyAvatar::updateCollisionWithAvatars(float deltaTime) { avatar->getPosition(), theirCapsuleRadius, theirCapsuleHeight, penetration)) { // move the avatar out by half the penetration setPosition(_position - 0.5f * penetration); - glm::vec3 pushOut = 0.5f * penetration; } } } diff --git a/interface/src/renderer/GeometryCache.cpp b/interface/src/renderer/GeometryCache.cpp index c02f69b8fb..78cc657018 100644 --- a/interface/src/renderer/GeometryCache.cpp +++ b/interface/src/renderer/GeometryCache.cpp @@ -300,6 +300,8 @@ QSharedPointer GeometryCache::getGeometry(const QUrl& url, cons return geometry; } +const float NetworkGeometry::NO_HYSTERESIS = -1.0f; + NetworkGeometry::NetworkGeometry(const QUrl& url, const QSharedPointer& fallback, const QVariantHash& mapping, const QUrl& textureBase) : _request(url), @@ -307,9 +309,9 @@ NetworkGeometry::NetworkGeometry(const QUrl& url, const QSharedPointer& fallback, const QVariantHash& mapping = QVariantHash(), const QUrl& textureBase = QUrl());