From b56c7535d22a62db5e79fc76921591968fb3cb11 Mon Sep 17 00:00:00 2001
From: "nissim.hadar" <nissim.hadar@gmail.com>
Date: Sat, 30 Dec 2017 12:25:58 -0800
Subject: [PATCH] Added legacy functionality (for zones that used Background
 "skybox")

---
 libraries/entities-renderer/src/RenderableZoneEntityItem.cpp | 5 +++--
 libraries/entities/src/EntityItemProperties.cpp              | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
index 672ad1ceec..a6c0b374fa 100644
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
@@ -190,7 +190,8 @@ void ZoneEntityRenderer::doRender(RenderArgs* args) {
             _skyboxOnIndex = NO_STORED_VALUE;
         }
 
-        if (_skyboxMode != COMPONENT_MODE_INHERIT) {
+        // _backgroundMode is kept for legacy purposes
+        if (_skyboxMode != COMPONENT_MODE_INHERIT || _backgroundMode != BACKGROUND_MODE_INHERIT) {
             _backgroundStage->_currentFrame.pushBackground(_backgroundIndex);
         }
 
@@ -205,7 +206,7 @@ void ZoneEntityRenderer::doRender(RenderArgs* args) {
             _ambientOnIndex = NO_STORED_VALUE;
         }
 
-        if (_ambientLightMode != COMPONENT_MODE_INHERIT && (_validAmbientTexture)) {
+        if (_ambientLightMode != COMPONENT_MODE_INHERIT && _validAmbientTexture) {
             _stage->_currentFrame.pushAmbientLight(_ambientIndex);
         }
 
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 3a38e4acd7..d5a58c9580 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -2130,6 +2130,7 @@ void EntityItemProperties::markAllChanged() {
 
     _keyLight.markAllChanged();
     _ambientLight.markAllChanged();
+    _skybox.markAllChanged();
 
     _backgroundModeChanged = true;
     _hazeModeChanged = true;