diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-07-31 10:10:13 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-09-04 11:11:55 +0000 |
| commit | 7cf2a201e3510f3b40d90c9054353106923ed165 (patch) | |
| tree | cc0f86edd40febd512e6b3b786c890a31225f5ca /src/quick3d | |
| parent | c69ebe3a79c727e99d7c654841cb46f0fa967332 (diff) | |
QMetalRoughMaterial replaces QTexturedMetalRoughMaterial
This is a complete drop in replacement now, no need to keep code for
both. We use inheritance so that properties in QMetalRoughMaterial can
be versioned properly.
Change-Id: Ia95b40c5abd466fbb20e5b15ca4e6d167fb80ec3
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d')
| -rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index d60603e8c..61d27444a 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -69,8 +69,8 @@ #include <Qt3DExtras/qspritegrid.h> #include <Qt3DExtras/qspritesheetitem.h> #include <Qt3DExtras/qtext2dentity.h> -#include <Qt3DExtras/qtexturedmetalroughmaterial.h> #include <Qt3DExtras/qtexturematerial.h> +#include <Qt3DExtras/qtexturedmetalroughmaterial.h> #include <Qt3DExtras/qtorusgeometry.h> #include <Qt3DExtras/qtorusmesh.h> |