diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:04:17 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:04:17 +0100 |
| commit | bf40a6cbf6b0045c157431f2717697c37bd20697 (patch) | |
| tree | 1c0ec64c7e4833d5f70f4816a55913353ed31ec9 /src/extras/defaults/qmetalroughmaterial.cpp | |
| parent | d51c6983baedc283020b39062714962b6b7d0c5e (diff) | |
| parent | f4ce60ca6b92c5cbfebf7ed5f8436e5d84bfeab4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1
Change-Id: I9b3faae3e87e1c68ae34bac278f08087dc6ac1a9
Diffstat (limited to 'src/extras/defaults/qmetalroughmaterial.cpp')
| -rw-r--r-- | src/extras/defaults/qmetalroughmaterial.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/extras/defaults/qmetalroughmaterial.cpp b/src/extras/defaults/qmetalroughmaterial.cpp index f52437769..c6913b490 100644 --- a/src/extras/defaults/qmetalroughmaterial.cpp +++ b/src/extras/defaults/qmetalroughmaterial.cpp @@ -167,7 +167,7 @@ void QMetalRoughMaterialPrivate::handleTextureScaleChanged(const QVariant &var) \inherits Qt3DRender::QMaterial This material uses an effect with a single render pass approach and performs per fragment - lighting. Techniques are provided for OpenGL 3 only. + lighting. Techniques are provided for OpenGL 3 and OpenGL ES 3. */ /*! |