From 5c1972e3f411129691fe2a061c89f421933c0974 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 24 Oct 2018 12:40:44 -0700
Subject: [PATCH] fix fallback properties

---
 scripts/system/html/js/entityProperties.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index a3f986ad53..db3424bbd9 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -2935,7 +2935,21 @@ function loaded() {
                                 continue;
                             }
                             
-                            if (!propertyValue && propertyData.fallbackProperty !== undefined) {
+                            let isPropertyNotNumber = false;
+                            switch (propertyData.type) {
+                                case 'number':
+                                case 'slider':
+                                    isPropertyNotNumber = isNaN(propertyValue) || propertyValue === null;
+                                    break;
+                                case 'vec3':
+                                case 'vec2':
+                                    isPropertyNotNumber = isNaN(propertyValue.x) || propertyValue.x === null;
+                                    break;
+                                case 'color':
+                                    isPropertyNotNumber = isNaN(propertyValue.red) || propertyValue.red === null;
+                                    break;
+                            }
+                            if (isPropertyNotNumber && propertyData.fallbackProperty !== undefined) {
                                 propertyValue = getPropertyValue(propertyData.fallbackProperty);
                             }
                             
@@ -3000,9 +3014,6 @@ function loaded() {
                                     break;
                                 }
                                 case 'color': {
-                                    if (!propertyValue.red && propertyData.fallbackProperty !== undefined) {
-                                        propertyValue = getPropertyValue(propertyData.fallbackProperty);
-                                    }
                                     property.elColorPicker.style.backgroundColor = "rgb(" + propertyValue.red + "," + 
                                                                                      propertyValue.green + "," + 
                                                                                      propertyValue.blue + ")";