From bc60c90308e70fb717d9ce61666cdc6e1d006c61 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 13 Nov 2014 08:39:19 -0800
Subject: [PATCH] only actually set the properties if they were in the buffer

---
 libraries/entities/src/ModelEntityItem.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 095b1099b2..ee13ed171b 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -112,9 +112,15 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     READ_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, float, animationFrameIndex);
     READ_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, bool, animationIsPlaying);
     
-    setAnimationIsPlaying(animationIsPlaying);
-    setAnimationFPS(animationFPS);
-    setAnimationFrameIndex(animationFrameIndex);
+    if (propertyFlags.getHasProperty(PROP_ANIMATION_PLAYING)) {
+        setAnimationIsPlaying(animationIsPlaying);
+    }
+    if (propertyFlags.getHasProperty(PROP_ANIMATION_FPS)) {
+        setAnimationFPS(animationFPS);
+    }
+    if (propertyFlags.getHasProperty(PROP_ANIMATION_FRAME_INDEX)) {
+        setAnimationFrameIndex(animationFrameIndex);
+    }
 
     READ_ENTITY_PROPERTY_STRING(PROP_TEXTURES, setTextures);
     READ_ENTITY_PROPERTY_STRING(PROP_ANIMATION_SETTINGS, setAnimationSettings);