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

This commit is contained in:
Sam Gateau 2014-11-07 14:27:51 -08:00
commit f3fe934fe2

View file

@ -696,6 +696,7 @@ bool EntityItemProperties::encodeEraseEntityMessage(const EntityItemID& entityIt
void EntityItemProperties::markAllChanged() {
_positionChanged = true;
_dimensionsChanged = true;
_rotationChanged = true;
_massChanged = true;
_velocityChanged = true;
@ -716,6 +717,8 @@ void EntityItemProperties::markAllChanged() {
_glowLevelChanged = true;
_localRenderAlphaChanged = true;
_isSpotlightChanged = true;
_ignoreForCollisionsChanged = true;
_collisionsWillMoveChanged = true;
_diffuseColorChanged = true;
_ambientColorChanged = true;