diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-11 14:58:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-04-23 11:14:30 +0000 |
| commit | 0542f1614aa6d50c4c9809fb0ce5f1adb5666d67 (patch) | |
| tree | 77a1ed41c16262f5cc7aa9ddb2d66d3f9b61a719 /examples/qt3d/materials-cpp/barrel.h | |
| parent | 8677f62fa690efa29fbb6f870af1ea2b4e7111cf (diff) | |
Move defaults and geometries out of Qt3DRender and into Qt3DExtras
QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on.
Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/materials-cpp/barrel.h')
| -rw-r--r-- | examples/qt3d/materials-cpp/barrel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/qt3d/materials-cpp/barrel.h b/examples/qt3d/materials-cpp/barrel.h index 293501519..237ab446c 100644 --- a/examples/qt3d/materials-cpp/barrel.h +++ b/examples/qt3d/materials-cpp/barrel.h @@ -51,7 +51,7 @@ #ifndef BARREL_H #define BARREL_H -#include <Qt3DRender/QNormalDiffuseSpecularMapMaterial> +#include <Qt3DExtras/QNormalDiffuseSpecularMapMaterial> #include <Qt3DRender/qtexture.h> #include "renderableentity.h" @@ -96,7 +96,7 @@ private: Bumps m_bumps; DiffuseColor m_diffuseColor; SpecularColor m_specularColor; - Qt3DRender::QNormalDiffuseSpecularMapMaterial *m_material; + Qt3DExtras::QNormalDiffuseSpecularMapMaterial *m_material; Qt3DRender::QAbstractTexture *m_diffuseTexture; Qt3DRender::QAbstractTexture *m_normalTexture; Qt3DRender::QAbstractTexture *m_specularTexture; |