merge from other branch

This commit is contained in:
Seth Alves 2016-05-13 07:11:57 -07:00
commit dabecb7cc2

View file

@ -799,12 +799,15 @@ void RenderableModelEntityItem::locationChanged(bool tellPhysics) {
_model->setRotation(getRotation()); _model->setRotation(getRotation());
_model->setTranslation(getPosition()); _model->setTranslation(getPosition());
// { auto myMetaItemCopy = _myMetaItem;
// render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
// render::PendingChanges pendingChanges; void* key = (void*)this;
// pendingChanges.updateItem<RenderableModelEntityItemMeta>(_myMetaItem, [](RenderableModelEntityItemMeta& data){}); AbstractViewStateInterface::instance()->pushPostUpdateLambda(key, [_myMetaItem]() {
// scene->enqueuePendingChanges(pendingChanges); render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
// } render::PendingChanges pendingChanges;
pendingChanges.updateItem<RenderableModelEntityItemMeta>(myMetaItemCopy, [](RenderableModelEntityItemMeta& data){});
scene->enqueuePendingChanges(pendingChanges);
});
} }
} }