diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-01-10 15:58:37 +0200 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-01-15 12:14:12 +0000 |
| commit | 5e9a1798cc697136aae4125a157e654d7e49530a (patch) | |
| tree | a3dd42c0f4e84197547c7a786a4c7be406661698 /src/runtime/q3dsuippresentation_p.h | |
| parent | 0cf63f1de93635c85fc3120cdfce3410a59edc9b (diff) | |
Support custom materials created from a QByteArray
Allow a QByteArray to be used to create a custom material instead
reading it from a file.
Task-number: QT3DS-2906
Change-Id: I2718240186b62c0ff2bf36e5313bed6754472066
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/runtime/q3dsuippresentation_p.h')
| -rw-r--r-- | src/runtime/q3dsuippresentation_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/runtime/q3dsuippresentation_p.h b/src/runtime/q3dsuippresentation_p.h index 2e89a22..064456b 100644 --- a/src/runtime/q3dsuippresentation_p.h +++ b/src/runtime/q3dsuippresentation_p.h @@ -2120,6 +2120,7 @@ public: void registerImageBuffer(const QString &sourcePath, bool hasTransparency); Q3DSCustomMaterial customMaterial(const QString &idOrFilename); + Q3DSCustomMaterial customMaterial(const QByteArray &id, const QByteArray &data); Q3DSEffect effect(const QString &idOrFilename); Q3DSBehavior behavior(const QString &idOrFilename); MeshList mesh(const QString &assetFilename, int part = 1); |