summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2016-08-10 16:14:36 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2016-08-11 07:00:55 +0000
commitba72ff8d2e85765e4a346094826172bbdc1dc5de (patch)
treeb6a37dd6cc833f26b1a4e2460307d13103e9f305
parent2cd01dec560a03192bcccff6ccc1f95cc383bace (diff)
Ensure InputSettings and RenderSettings are exported in proper order
Change-Id: Ia933bac96654554e53fe299f5fce760b86f3a35e Reviewed-by: Janne Koskinen <janne.p.koskinen@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--editorlib/src/editorsceneparser.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/editorlib/src/editorsceneparser.cpp b/editorlib/src/editorsceneparser.cpp
index fa2185b..dd8aca7 100644
--- a/editorlib/src/editorsceneparser.cpp
+++ b/editorlib/src/editorsceneparser.cpp
@@ -289,8 +289,10 @@ bool EditorSceneParser::exportQmlScene(Qt3DCore::QEntity *sceneEntity, const QUr
Qt3DCore::QTransform *sceneEntityTransform = new Qt3DCore::QTransform;
sceneEntity->addComponent(sceneEntityTransform);
- m_stream << indent() << componentsStart << outComponent(renderSettings) << QStringLiteral(",")
- << outComponent(inputSettings) << componentsEnd << endl << endl;
+ QString inputSettingsId = outComponent(inputSettings);
+ QString renderSettingsId = outComponent(renderSettings);
+ m_stream << indent() << componentsStart << renderSettingsId << QStringLiteral(",")
+ << inputSettingsId << componentsEnd << endl << endl;
forwardRenderer->setCamera(nullptr);
delete renderSettings;