Merge remote-tracking branch 'origin/master' into Animations

# Conflicts:
#	resources/Schema/Types/Entity.xsd
This commit is contained in:
viktorljung
2016-03-03 23:21:14 +01:00
63 changed files with 13161 additions and 2602 deletions
+12
View File
@@ -34,6 +34,18 @@ EntityWrapper EntityWrapper::Parent()
}
}
EntityWrapper EntityWrapper::FirstParentByName(const std::string& parentEntityName)
{
EntityWrapper entity = *this;
while (entity.Parent().Valid()) {
entity = entity.Parent();
if (entity.Name() == parentEntityName) {
return entity;
}
}
return EntityWrapper::Invalid;
}
EntityWrapper EntityWrapper::FirstChildByName(const std::string& name)
{
return firstChildByNameRecursive(name, this->ID);