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

This commit is contained in:
Stephen Birarda 2014-11-07 14:28:53 -08:00
commit 5e3e363066

View file

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