diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-02-05 16:52:04 +0200 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-02-06 11:29:16 +0000 |
| commit | 8ca98cea890c52a6576a1a277f2acffde9ef965e (patch) | |
| tree | 69fd67ded154941087989214feefb77320f38290 | |
| parent | 97c8ccf181fb101509941496d3a371028398e30f (diff) | |
Return already created material with the same id
Previous ids were not checked when creating a custom material without a
file.
Change-Id: I569d72c01eb7b1ffbb105da5bfb402ddd8b12ee2
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/runtime/q3dsuippresentation.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/runtime/q3dsuippresentation.cpp b/src/runtime/q3dsuippresentation.cpp index 94adafe..af2b710 100644 --- a/src/runtime/q3dsuippresentation.cpp +++ b/src/runtime/q3dsuippresentation.cpp @@ -4367,6 +4367,9 @@ Q3DSCustomMaterial Q3DSUipPresentation::customMaterial(const QString &idOrFilena Q3DSCustomMaterial Q3DSUipPresentation::customMaterial(const QByteArray &id, const QByteArray &data) { + if (d->customMaterials.contains(id)) + return d->customMaterials.value(id); + Q3DSCustomMaterialParser p; bool ok = false; Q3DSCustomMaterial mat = p.parse(data, &ok); |