diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c84165456e..bc3eaaf736 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2920,6 +2920,7 @@ void Application::updateShadowMap() { glTranslatef(translation.x, translation.y, translation.z); renderAvatars(true); + _particles.render(); glPopMatrix(); diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index 7530096e9d..69a339ef06 100755 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -377,7 +377,7 @@ void Hand::render( bool isMine) { } // Render toy ball - if (isMine) { + if (isMine && _hasToyBall) { glPushMatrix(); glColor3f(1, 0, 0); glTranslatef(_toyBallPosition.x, _toyBallPosition.y, _toyBallPosition.z); diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index d10248d9e3..7f7deecf77 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -887,7 +887,6 @@ int Octree::encodeTreeBitstreamRecursion(OctreeElement* node, unsigned char childrenExistInTreeBits = 0; unsigned char childrenExistInPacketBits = 0; unsigned char childrenColoredBits = 0; - const int BYTES_PER_COLOR = 3; // Make our local buffer large enough to handle writing at this level in case we need to. LevelDetails thisLevelKey = packetData->startLevel();