diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-05-09 09:53:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-25 14:49:32 +0200 |
| commit | ee29ee5ecc144480ccb8d8d222179399d8705a2e (patch) | |
| tree | bb55c31b1d0330b220395992e516f10824b49fea /src/render/io/gltfparser.cpp | |
| parent | a9af564dcecef8041a4725901d53c569c343f645 (diff) | |
Quick3DScene and SceneNode
Examples updated to work with those new nodes. Quick3DScene and SceneNode
subclass Quick3DEntity, Scene and EntityNode, Scene respectively. This will
later ease the process of exposing Cameras loaded from a scene file to be used
by a CameraSelector in the FrameGraph. Also it allows to add children Node to
the scene on the Qml side.
Change-Id: I6843efd0aff60e51a9bd16c63ce19011afd5a8e5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
| -rw-r--r-- | src/render/io/gltfparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index c9888af2d..f846b430b 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -259,7 +259,7 @@ EntityNode* GLTFParser::scene(QString id) QJsonObject scenes = m_json.object().value(KEY_SCENES).toObject(); if (!scenes.contains(id)) { qWarning() << "GLTF: no such scene" << id << "in file" << m_basePath; - return NULL; + return defaultScene(); } QJsonObject sceneObj = scenes.value(id).toObject(); |