Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-15 16:09:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dk/zoneFilters2' of https://github.com/davidkelly/hifi into dk/zoneFilters2

Browse source
This commit is contained in:
David Kelly 2017-02-13 10:23:48 -07:00
commit d9319c2c2c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities/src/EntityTree.cpp
View file

@ -929,7 +929,8 @@ bool EntityTree::filterProperties(EntityItemPointer& existingEntity, EntityItemP
bool accepted = true;
auto entityEditFilters = DependencyManager::get<EntityEditFilters>();
if (entityEditFilters) {
accepted = entityEditFilters->filter(existingEntity->getPosition(), propertiesIn, propertiesOut, wasChanged, filterType);
auto position = existingEntity->getPosition();
accepted = entityEditFilters->filter(position, propertiesIn, propertiesOut, wasChanged, filterType);
}
return accepted;