Merge branch 'master' of https://github.com/worklist/hifi into ssao
Merge branch 'master' of https://github.com/worklist/hifi into ssao
Add blur scale uniform.
Merge branch 'master' of https://github.com/worklist/hifi into ssao
Optimizations for occlusion blur (the main one being that we only need to
sample the texture four, not sixteen, times if we turn on linear filtering
and sample between the texels).
switch to one channel from PortAudio to resolve USB error
Merge pull request #871 from birarda/master

fix for logitech USB reporting only one channel
Merge branch 'master' of https://github.com/worklist/hifi into ssao
Cleanup.
More cleanup.
switch OS X base SDK to 10.7
Several VoxelSystems can have different view frustum
Merge pull request #874 from Atlante45/master

Several VoxelSystems can have different view frustum
Merge pull request #872 from ey6es/ssao

Performance improvement for the SSAO blur step, cleanup.
Merge pull request #873 from birarda/master

switch OS X base SDK to 10.7
Default to diffuse/add mode, fix for interacting with ambient occlusion.
Unfortunately, I managed to break the diffusion somehow.
Merge branch 'master' of https://github.com/worklist/hifi