diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:27:02 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:27:02 +0100 |
| commit | 720431716a8af66d1be73a1c9462ef12af831c90 (patch) | |
| tree | c54a9e61a4507247de404046338d38ca2828540e /src/imports | |
| parent | 6766fcf138b7cec101cd0c7d3d9a7ac42f1bfe3a (diff) | |
| parent | 9aac83d22ddbebc22fb1360d710263d349c2fdda (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/shaders/shadereffectsource.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/imports/shaders/shadereffectsource.cpp b/src/imports/shaders/shadereffectsource.cpp index b5462c71..f58b5464 100644 --- a/src/imports/shaders/shadereffectsource.cpp +++ b/src/imports/shaders/shadereffectsource.cpp @@ -285,8 +285,7 @@ void ShaderEffectSource::bind() GLuint vwrap = (m_wrapMode == Repeat || m_wrapMode == RepeatVertically) ? GL_REPEAT : GL_CLAMP_TO_EDGE; #if !defined(QT_OPENGL_ES_2) - if (!QOpenGLFunctions::isES()) - glEnable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); #endif if (m_fbo && m_fbo->isValid()) { |