Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Cleanup on aisle three!  Removed the color/normal/voxelized spanner bits, as
well as the throbbing/scripted guides and the notion of spanner masking.
Fix for hang on test exit.
Merge remote-tracking branch 'hifi/master'
Merge remote-tracking branch 'hifi/master'
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Merge remote-tracking branch 'hifi/master'
Merge remote-tracking branch 'hifi/master'
Added merged flag to Spanner.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Merge remote-tracking branch 'hifi/master'
Moved spanners into separate file, working on heightfields as spanners.
Merge remote-tracking branch 'hifi/master'
More work on heightfield spanners.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
More heightfield bits.
Merge remote-tracking branch 'hifi/master'