From 205a2d53b64cfa67425203a35b8a285508c4a92a Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1@gmail.com>
Date: Fri, 7 Aug 2015 16:15:51 -0700
Subject: [PATCH] no longer returning early on NaN

---
 .../entities-renderer/src/RenderablePolyLineEntityItem.cpp   | 2 --
 .../entities-renderer/src/RenderablePolyLineEntityItem.h     | 2 +-
 libraries/entities/src/PolyLineEntityItem.h                  | 5 ++++-
 libraries/octree/src/OctreePacketData.cpp                    | 2 +-
 libraries/shared/src/RegisteredMetaTypes.cpp                 | 4 ----
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index 270c38edb6..05abe40635 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -119,8 +119,6 @@ void RenderablePolyLineEntityItem::updateGeometry() {
     }
     _pointsChanged = false;
     
-    _pointsChanged = false;
-    
 }
 
 
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
index 9da641a6f4..59bf416d7a 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
@@ -2,7 +2,7 @@
 //  RenderablePolyLineEntityItem.h
 //  libraries/entities-renderer/src/
 //
-//  Created by Eric Levin on 5/11/15.
+//  Created by Eric Levin on 6/22/15.
 //  Copyright 2015 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
diff --git a/libraries/entities/src/PolyLineEntityItem.h b/libraries/entities/src/PolyLineEntityItem.h
index f1126be9c1..25b348fa55 100644
--- a/libraries/entities/src/PolyLineEntityItem.h
+++ b/libraries/entities/src/PolyLineEntityItem.h
@@ -44,8 +44,11 @@ class PolyLineEntityItem : public EntityItem {
     const rgbColor& getColor() const { return _color; }
     xColor getXColor() const { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; }
 
-    void setColor(const rgbColor& value) { memcpy(_color, value, sizeof(_color)); }
+    void setColor(const rgbColor& value) {
+        memcpy(_color, value, sizeof(_color));
+    }
     void setColor(const xColor& value) {
+        
         _color[RED_INDEX] = value.red;
         _color[GREEN_INDEX] = value.green;
         _color[BLUE_INDEX] = value.blue;
diff --git a/libraries/octree/src/OctreePacketData.cpp b/libraries/octree/src/OctreePacketData.cpp
index d8c3a88eb0..8430e21d79 100644
--- a/libraries/octree/src/OctreePacketData.cpp
+++ b/libraries/octree/src/OctreePacketData.cpp
@@ -623,7 +623,7 @@ int OctreePacketData::unpackDataFromBytes(const unsigned char *dataBytes, QVecto
     return sizeof(uint16_t) + length * sizeof(glm::vec3);
 }
 
-int OctreePacketData::unpackDataFromBytes(const unsigned char *dataBytes, QVector<float>& result) {
+int OctreePacketData::unpackDataFromBytes(const unsigned char* dataBytes, QVector<float>& result) {
     uint16_t length;
     memcpy(&length, dataBytes, sizeof(uint16_t));
     dataBytes += sizeof(length);
diff --git a/libraries/shared/src/RegisteredMetaTypes.cpp b/libraries/shared/src/RegisteredMetaTypes.cpp
index fd164cc287..c4e05a68fb 100644
--- a/libraries/shared/src/RegisteredMetaTypes.cpp
+++ b/libraries/shared/src/RegisteredMetaTypes.cpp
@@ -109,10 +109,6 @@ QScriptValue qVectorFloatToScriptValue(QScriptEngine* engine, const QVector<floa
     QScriptValue array = engine->newArray();
     for (int i = 0; i < vector.size(); i++) {
         float num = vector.at(i);
-        if(num != num) {
-            //if num is NaN don't convert it
-            return array;
-        }
         array.setProperty(i, QScriptValue(num));
     }
     return array;