From e74d30ce22788b41fdb802543cd01d576a0620a8 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 27 Jun 2018 17:43:41 -0700
Subject: [PATCH] fix color fallbacks

---
 scripts/system/particle_explorer/particleExplorerTool.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/particle_explorer/particleExplorerTool.js b/scripts/system/particle_explorer/particleExplorerTool.js
index 0de86fbf2f..b675d26ff6 100644
--- a/scripts/system/particle_explorer/particleExplorerTool.js
+++ b/scripts/system/particle_explorer/particleExplorerTool.js
@@ -108,7 +108,7 @@ ParticleExplorerTool = function() {
                 var fallbackValue = updatedSettings[fallbackProp];
                 if (fallbackValue) {
                     var optionalProp = optionalProps[i];
-                    if (isNaN(entityProps[optionalProp]) || (fallbackProp === "color" && isNaN(entityProps[optionalProp].red))) {
+                    if ((fallbackProp !== "color" && isNaN(entityProps[optionalProp])) || (fallbackProp === "color" && isNaN(entityProps[optionalProp].red))) {
                         that.updatedActiveParticleProperties[optionalProp] = fallbackValue;
                         needsUpdate = true;
                     }