diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-01-28 14:34:26 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-08 15:02:02 +0000 |
| commit | af3eb98b22a83275335d6ac702ed7ba0e8b394bb (patch) | |
| tree | 984d41b72e18ed0448b9ecbfdda6c5ad0e27abdc /src/render/defaults/qdiffusespecularmapmaterial.cpp | |
| parent | 6ac96d11449769118dc1f5b443fc7112bed3facc (diff) | |
Make ctor of QAbstractTextureProvider protected
That enforces to use one of the subclasses.
Change-Id: Idba7300ed322954ba6866c4a262ad4ee74c024e5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/defaults/qdiffusespecularmapmaterial.cpp')
| -rw-r--r-- | src/render/defaults/qdiffusespecularmapmaterial.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index ce0abe9f2..0df8a8082 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -61,8 +61,8 @@ namespace Qt3D { QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate(QDiffuseSpecularMapMaterial *qq) : QMaterialPrivate(qq) , m_diffuseSpecularMapEffect(new QEffect()) - , m_diffuseTexture(new QAbstractTextureProvider(QAbstractTextureProvider::Target2D)) - , m_specularTexture(new QAbstractTextureProvider(QAbstractTextureProvider::Target2D)) + , m_diffuseTexture(new QTexture2D()) + , m_specularTexture(new QTexture2D()) , m_ambientParameter(new QParameter(QStringLiteral("ka"), QColor::fromRgbF(0.05f, 0.05f, 0.05f, 1.0f))) , m_diffuseParameter(new QParameter(QStringLiteral("diffuseTexture"), m_diffuseTexture)) , m_specularParameter(new QParameter(QStringLiteral("specularTexture"), m_specularTexture)) |