Merge branch 'master' of github.com:highfidelity/hifi into atp-client

This commit is contained in:
Seth Alves 2017-07-05 11:07:51 -07:00
commit b147c3a843

View file

@ -34,6 +34,8 @@ in vec2 _texCoord0;
out vec4 _fragColor;
void main(void) {
_fragColor = vec4(0.0);
// Grab the fragment data from the uv
vec2 texCoord = _texCoord0.st;