v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into qt_assimp_viewer

pull/1981/head
smalcom 2018-05-25 21:20:03 +03:00
parent 67eff10d8f 604b56b96f
commit 5b23492421
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/glTF2Asset.inl
View File

@ -1216,12 +1216,15 @@ inline void Asset::Load(const std::string& pFile, bool isBinary)
// Read the "scene" property, which specifies which scene to load // Read the "scene" property, which specifies which scene to load
// and recursively load everything referenced by it // and recursively load everything referenced by it
unsigned int sceneIndex = 0;
if (Value* scene = FindUInt(doc, "scene")) { if (Value* scene = FindUInt(doc, "scene")) {
unsigned int sceneIndex = scene->GetUint(); sceneIndex = scene->GetUint();
}
Ref<Scene> s = scenes.Retrieve(sceneIndex); if (Value* scenesArray = FindArray(doc, "scenes")) {
if (sceneIndex < scenesArray->Size()) {
this->scene = s; this->scene = scenes.Retrieve(sceneIndex);
}
} }
// Clean up // Clean up