diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:38:39 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:39:23 +0100 |
commit | 8b0018cb1a4dea8e74de01427d79494a68d843c6 (patch) | |
tree | b6d8de4f486ccf0a4dc2f4c2b385d3f69db6e19e /src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag | |
parent | 7722638fcd57f2e826bac61c3bf9ab2a7e190088 (diff) | |
parent | 63b90a1d334743b63f396331434e9b12e366f9d3 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: Ie7a50a1cc66ddffe04933f77323d03941e0d7acd
Diffstat (limited to 'src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag')
-rw-r--r-- | src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag b/src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag index 496f4777..4a4284e1 100644 --- a/src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag +++ b/src/datavisualization/engine/shaders/surfaceTexturedShadowFlat.frag @@ -2,7 +2,7 @@ #extension GL_EXT_gpu_shader4 : require -varying highp vec3 coords_mdl; +varying highp vec2 coords_mdl; varying highp vec3 position_wrld; flat varying highp vec3 normal_cmr; varying highp vec3 eyeDirection_cmr; |