Merge branch 'master' into fix-transition-issue

OpenGeoscience · Dec 1, 2016 · 90d21ad · 90d21ad
2 parents cf3b96e + 044144e
commit 90d21ad
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/gl/quadFeature.js b/src/gl/quadFeature.js
@@ -42,7 +42,7 @@ var gl_quadFeature = function (arg) {
     'uniform highp vec2 crop;',
     'void main(void) {',
     '  mediump vec4 color = texture2D(sampler2d, iTextureCoord);',
-    '  if (iTextureCoord.s > crop.s || 1.0 - iTextureCoord.t > crop.t) {',
+    '  if ((crop.s < 1.0 && iTextureCoord.s > crop.s) || (crop.t < 1.0 && 1.0 - iTextureCoord.t > crop.t)) {',
     '    discard;',
     '  }',
     '  color.w *= opacity;',