diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-04-03 09:25:12 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-04-03 09:25:52 +0100 |
| commit | 4e316f58f7d063efc0c90fc5ffcfc4d20622f2c8 (patch) | |
| tree | f14ec1d1a59d6605e3fefa3f75e24c5e9415e942 /src/plugins/sceneparsers/gltfexport/gltfexporter.cpp | |
| parent | 172287f824b740a7e2ce75e811c0858cbe0c40c1 (diff) | |
| parent | 89644c7f31b59fbb186bdcafd30c3aefb9ee0644 (diff) | |
Merge branch '5.9' into dev
Change-Id: I5ba00475ad83132589f99348500a7103a03474b0
Diffstat (limited to 'src/plugins/sceneparsers/gltfexport/gltfexporter.cpp')
| -rw-r--r-- | src/plugins/sceneparsers/gltfexport/gltfexporter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp index ba0649d3b..5fb1241d0 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp +++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp @@ -168,6 +168,7 @@ inline QJsonArray vec2jsvec(const QVector4D &v) return arr; } +#if 0 // unused for now inline QJsonArray matrix2jsvec(const QMatrix2x2 &matrix) { QJsonArray jm; @@ -185,6 +186,7 @@ inline QJsonArray matrix2jsvec(const QMatrix3x3 &matrix) jm.append(*mtxp++); return jm; } +#endif inline QJsonArray matrix2jsvec(const QMatrix4x4 &matrix) { @@ -225,7 +227,7 @@ using namespace Qt3DExtras; namespace Qt3DRender { -Q_LOGGING_CATEGORY(GLTFExporterLog, "Qt3D.GLTFExport") +Q_LOGGING_CATEGORY(GLTFExporterLog, "Qt3D.GLTFExport", QtWarningMsg) const QString MATERIAL_DIFFUSE_COLOR = QStringLiteral("kd"); const QString MATERIAL_SPECULAR_COLOR = QStringLiteral("ks"); |