From 30584c1ec178d9756be551287d9ab2e9eca63a7e Mon Sep 17 00:00:00 2001 From: Evangel Date: Sun, 22 Nov 2020 15:36:08 +1000 Subject: [PATCH] Replaced name with scene_name to avoid shadowing. --- code/AssetLib/glTF2/glTF2Asset.inl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/AssetLib/glTF2/glTF2Asset.inl b/code/AssetLib/glTF2/glTF2Asset.inl index af9a4e94e..c892e6697 100644 --- a/code/AssetLib/glTF2/glTF2Asset.inl +++ b/code/AssetLib/glTF2/glTF2Asset.inl @@ -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")) {