Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1

This commit is contained in:
Seth Alves 2017-09-08 17:03:29 -07:00
commit 56d5f587b6

View file

@ -648,7 +648,9 @@ void Avatar::render(RenderArgs* renderArgs) {
return;
}
fixupModelsInScene(renderArgs->_scene);
if (!isMyAvatar()) {
fixupModelsInScene(renderArgs->_scene);
}
if (showCollisionShapes && shouldRenderHead(renderArgs) && _skeletonModel->isRenderable()) {
PROFILE_RANGE_BATCH(batch, __FUNCTION__":skeletonBoundingCollisionShapes");