diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-14 08:41:55 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-14 08:41:55 (GMT) |
| commit | b0557f0d11b247284e2b5e879b34f9d28a99e3e4 (patch) | |
| tree | a27fe0bba21219e00696fda2c05aca080524c3a0 /src/opengl/util | |
| parent | 5f7d9f9efe78fa7e537c32177c1b66a76fffddde (diff) | |
| parent | 42a67d48d8772b91f59c4141b278a46d402d4276 (diff) | |
| download | Qt-b0557f0d11b247284e2b5e879b34f9d28a99e3e4.zip Qt-b0557f0d11b247284e2b5e879b34f9d28a99e3e4.tar.gz Qt-b0557f0d11b247284e2b5e879b34f9d28a99e3e4.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6
Diffstat (limited to 'src/opengl/util')
| -rw-r--r-- | src/opengl/util/pattern_brush.glsl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/opengl/util/pattern_brush.glsl b/src/opengl/util/pattern_brush.glsl index e070449..ac139b2 100644 --- a/src/opengl/util/pattern_brush.glsl +++ b/src/opengl/util/pattern_brush.glsl @@ -17,8 +17,6 @@ vec4 brush() coords *= inv_brush_texture_size; - coords.y = -coords.y; - float alpha = texture2D(brush_texture, coords).r; return gl_Color * alpha; |