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

Replaced name with scene_name to avoid shadowing.

pull/3510/head
Evangel 2020-11-22 15:36:08 +10:00
parent 67abcb10ba
commit 30584c1ec1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/AssetLib/glTF2/glTF2Asset.inl
View File

@ -1400,9 +1400,9 @@ inline void Node::Read(Value &obj, Asset &r) {
}
inline void Scene::Read(Value &obj, Asset &r) {
if (Value *name = FindString(obj, "name")) {
if (name->IsString()) {
this->name = name->GetString();
if (Value *scene_name = FindString(obj, "name")) {
if (scene_name->IsString()) {
this->name = scene_name->GetString();
}
}
if (Value *array = FindArray(obj, "nodes")) {