From 87e896ab20a90a1d10c81ced65527364628ca5fe Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Fri, 29 Dec 2017 15:13:46 -0800
Subject: [PATCH] Zone inheritance ready for testing.

---
 .../entities-renderer/src/RenderableZoneEntityItem.cpp    | 8 +++-----
 scripts/system/edit.js                                    | 2 --
 scripts/system/html/entityProperties.html                 | 3 +++
 scripts/system/html/js/entityProperties.js                | 7 +++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
index 8bf64db9b1..12e6d921b7 100644
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
@@ -184,8 +184,7 @@ void ZoneEntityRenderer::doRender(RenderArgs* args) {
             // Just turned off, store previous value before changing
             _skyboxOnIndex = _backgroundIndex;
             _backgroundIndex = _stage->getSunOffLight();
-        }
-        else if (_skyboxMode == COMPONENT_MODE_ENABLED && _skyboxOnIndex != NO_STORED_VALUE) {
+        } else if (_skyboxMode == COMPONENT_MODE_ENABLED && _skyboxOnIndex != NO_STORED_VALUE) {
             // Just turned on, restore previous value before clearing stored value
             _backgroundIndex = _skyboxOnIndex;
             _skyboxOnIndex = NO_STORED_VALUE;
@@ -200,14 +199,13 @@ void ZoneEntityRenderer::doRender(RenderArgs* args) {
             // Just turned off, store previous value before changing
             _ambientOnIndex = _ambientIndex;
             _ambientIndex = _stage->getAmbientOffLight();
-        }
-        else if (_ambientLightMode == COMPONENT_MODE_ENABLED && _ambientOnIndex != NO_STORED_VALUE) {
+        } else if (_ambientLightMode == COMPONENT_MODE_ENABLED && _ambientOnIndex != NO_STORED_VALUE) {
             // Just turned on, restore previous value before clearing stored value
             _ambientIndex = _ambientOnIndex;
             _ambientOnIndex = NO_STORED_VALUE;
         }
 
-        if (_ambientLightMode != COMPONENT_MODE_INHERIT && (_validAmbientTexture || _validSkyboxTexture)) {
+        if (_ambientLightMode != COMPONENT_MODE_INHERIT && (_validAmbientTexture)) {
             _stage->_currentFrame.pushAmbientLight(_ambientIndex);
         }
 
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index ae3f88bd4e..44366aa61c 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -2089,8 +2089,6 @@ var PropertiesTool = function (opts) {
                         Entities.reloadServerScripts(selectionManager.selections[i]);
                     }
                 }
-            } else if (data.action === "copySkyboxURLToAmbientURL") {
-                Window.notifyEditError("I DON'T KNOW HOW :(");
             }
         } else if (data.type === "propertiesPageReady") {
             updateSelections(true);
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index ee2301b219..38d6a99f0c 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -564,8 +564,11 @@
                     </div>
                 </fieldset>
                 <div class="zone-group zone-section skybox-section property url ">
+                    <br>
                     <label for="property-zone-skybox-url" width="80">Skybox URL</label>
                     <input type="text" id="property-zone-skybox-url">
+                    <br>
+                    <br>
                     <input type="button" id="copy-skybox-url-to-ambient-url" value="Copy URL to Ambient">
                 </div>
             </fieldset>
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 98e67cde05..2e0af2d23d 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -1492,10 +1492,9 @@ function loaded() {
 
         // Ambient light
         elCopySkyboxURLToAmbientURL.addEventListener("click", function () {
-             EventBridge.emitWebEvent(JSON.stringify({
-                 type: "action",
-                 action: "copySkyboxURLToAmbientURL"
-             }));
+            document.getElementById("property-zone-key-ambient-url").value = properties.skybox.url;
+            properties.ambientLight.ambientURL = properties.skybox.url;
+            updateProperties(properties);
         });
 
         var ambientLightModeChanged = createZoneComponentModeChangedFunction('ambientLightMode',