History

Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities

ZappoMan committed 12 years ago

Commit 2baac962 parents 780532b 43ac868110 files · +3160 −871Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 110 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+4−3
@@ -70,9 +70,10 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(EntityItemID · 69 unmodified lines
7070 }
7171 if (_entityTree) {
7272 _entityTree->lockForRead();
73− const EntityItem* model = _entityTree->findEntityByID(identity.id, true);
74− if (model) {
75− results = model->getProperties();
73+ EntityItem* entity = const_cast<EntityItem*>(_entityTree->findEntityByID(identity.id, true));
74+ if (entity) {
75+ entity->setSittingPoints(_entityTree->getGeometryForEntity(*entity)->sittingPoints);
76+ results = entity->getProperties();
7677 } else {
7778 results.setIsUnknownID();
7879 }