fix bug
Merge pull request #3044 from ZappoMan/master

fix bug
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels