Merge pull request #3 from gl-vis/fix-for-etienne-laptop

Replace || with * in if comparison statement

Author: dy

lib/shaders/frag.glsl

@@ -24,7 +24,7 @@ void main() {
 	float gamma = .0045 * charsStep / pointSize;
 
     //null-border case
-	if (borderWidth == 0. || borderColor.a == 0.) {
+ 	if (borderWidth * borderColor.a == 0.) {
 		float charAmt = smoothstep(.748 - gamma, .748 + gamma, dist);
 		gl_FragColor = vec4(charColor.rgb, charAmt*charColor.a);
 		return;