summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/qmaterial.h
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-02-24 16:01:45 +0000
committerRobert Brock <robert.brock@kdab.com>2016-02-25 11:49:31 +0000
commitd95ef5a39732d4f84aa7c779931f849f4b821ed6 (patch)
tree7f86ad80a5d76391fd41d848c74584b467926133 /src/render/materialsystem/qmaterial.h
parentdfe0d0cb24a554455f774741e06e1cbd50831b1a (diff)
QMaterial removed tetureValues and setTextureParameter
As per API review. Found that these weren't being used. Change-Id: Ifa9f2817e9bd996f19dfb929e969efa21b8c3bc1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/materialsystem/qmaterial.h')
-rw-r--r--src/render/materialsystem/qmaterial.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h
index 1ff24ae18..571a32095 100644
--- a/src/render/materialsystem/qmaterial.h
+++ b/src/render/materialsystem/qmaterial.h
@@ -53,7 +53,6 @@ class QAbstractTextureProvider;
class QParameter;
class QMaterialPrivate;
class QEffect;
-typedef QMap<QString, QAbstractTextureProvider*> TextureDict;
class QT3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent
{
@@ -70,10 +69,6 @@ public:
void removeParameter(QParameter *parameter);
QList<QParameter *> parameters() const;
- TextureDict textureValues() const;
-
- void setTextureParameter(QString name, QAbstractTextureProvider* tex);
-
public Q_SLOTS:
void setEffect(QEffect *effect);