Remove custom behavior from chat window
Remove custom styling
Load splat texture as such when painting.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Working on voxel representations.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
HeightfieldTexture -> MaterialObject (we want to use it for voxels, too, and
eventually include components other than diffuse color).
Method renaming.
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Voxel material bits.
Working on voxel edits.
More voxel edit bits.
Working on voxel bits.
More voxel editing bits.
More progress towards computing Hermite data.
Hermite data computation.
More progress toward dual contour rendering.
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964

Conflicts:
	interface/ui/preferencesDialog.ui
Fix preferences dialog layout