From d0c0d6a388298ee38c6293b98ac8113e86d68bcf Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Mon, 8 Jan 2018 11:50:28 -0800
Subject: [PATCH] Set skybox mode as per legacy background mode if needed.

---
 libraries/entities/src/EntityTree.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 11927c4dca..07d004358a 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2288,7 +2288,12 @@ bool EntityTree::readFromMap(QVariantMap& map) {
             }
 
             if (!entityMap.contains("skyboxMode")) {
-                properties.setSkyboxMode(COMPONENT_MODE_ENABLED);
+                if (entityMap.contains("backgroundMode") && (entityMap["backgroundMode"].toString() == "nothing")) {
+                    properties.setSkyboxMode(COMPONENT_MODE_INHERIT);
+                } else {
+				    // either the background mode field is missing (shouldn't happen) or the background mode is "skybox"
+                    properties.setSkyboxMode(COMPONENT_MODE_ENABLED);
+                }
             }
 
             if (!entityMap.contains("ambientLightMode")) {