Replaced name with scene_name to avoid shadowing.
parent
67abcb10ba
commit
30584c1ec1
|
@ -1400,9 +1400,9 @@ inline void Node::Read(Value &obj, Asset &r) {
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void Scene::Read(Value &obj, Asset &r) {
|
inline void Scene::Read(Value &obj, Asset &r) {
|
||||||
if (Value *name = FindString(obj, "name")) {
|
if (Value *scene_name = FindString(obj, "name")) {
|
||||||
if (name->IsString()) {
|
if (scene_name->IsString()) {
|
||||||
this->name = name->GetString();
|
this->name = scene_name->GetString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (Value *array = FindArray(obj, "nodes")) {
|
if (Value *array = FindArray(obj, "nodes")) {
|
||||||
|
|
Loading…
Reference in New Issue