From 4593b33435ea1a73d7c011e0ac1e33f692cf876f Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 1 Nov 2018 14:23:21 -0700
Subject: [PATCH] Fix new models not obeying dynamic checkbox

---
 scripts/system/edit.js | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 6425806771..43b82c8615 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -484,23 +484,28 @@ var toolBar = (function () {
             originalProperties[key] = newProperties[key];
         }
     }
-    function createNewEntity(properties) {
-        var dimensions = properties.dimensions ? properties.dimensions : DEFAULT_DIMENSIONS;
+    function createNewEntity(requestedProperties) {
+        var dimensions = requestedProperties.dimensions ? requestedProperties.dimensions : DEFAULT_DIMENSIONS;
         var position = getPositionToCreateEntity();
         var entityID = null;
 
+        var properties = {};
+
         applyProperties(properties, DEFAULT_ENTITY_PROPERTIES.All);
 
-        var type = properties.type;
+        var type = requestedProperties.type;
         if (type == "Box" || type == "Sphere") {
             applyProperties(properties, DEFAULT_ENTITY_PROPERTIES.Shape);
         } else if (type == "Image") {
-            properties.type = "Model";
+            requestedProperties.type = "Model";
             applyProperties(properties, DEFAULT_ENTITY_PROPERTIES.Image);
         } else {
             applyProperties(properties, DEFAULT_ENTITY_PROPERTIES[type]);
         }
 
+        // We apply the requested properties first so that they take priority over any default properties.
+        applyProperties(properties, requestedProperties);
+
 
         if (position !== null && position !== undefined) {
             var direction;
@@ -845,41 +850,18 @@ var toolBar = (function () {
         addButton("newCubeButton", function () {
             createNewEntity({
                 type: "Box",
-                dimensions: DEFAULT_DIMENSIONS,
-                color: {
-                    red: 255,
-                    green: 0,
-                    blue: 0
-                }
             });
         });
 
         addButton("newSphereButton", function () {
             createNewEntity({
                 type: "Sphere",
-                dimensions: DEFAULT_DIMENSIONS,
-                color: {
-                    red: 255,
-                    green: 0,
-                    blue: 0
-                }
             });
         });
 
         addButton("newLightButton", function () {
             createNewEntity({
                 type: "Light",
-                isSpotlight: false,
-                color: {
-                    red: 150,
-                    green: 150,
-                    blue: 150
-                },
-                constantAttenuation: 1,
-                linearAttenuation: 0,
-                quadraticAttenuation: 0,
-                exponent: 0,
-                cutoff: 180 // in degrees
             });
         });