Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 14:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance

Browse source
This commit is contained in:
Nissim Hadar 2018-01-06 23:26:28 -08:00
commit bc98cbd58f
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/entities/src/EntityTree.cpp
View file

@ -2287,11 +2287,8 @@ bool EntityTree::readFromMap(QVariantMap& map) {
properties.setKeyLightMode(COMPONENT_MODE_ENABLED);
}
if (entityMap.contains("backgroundMode") && properties.getBackgroundModeAsString() == "skybox") {
if (!entityMap.contains("skyboxMode")) {
properties.setSkyboxMode(COMPONENT_MODE_ENABLED);
} else {
// The content creator has set the combo to NOTHING - this is actually inherit
properties.setSkyboxMode(COMPONENT_MODE_INHERIT);
}
if (!entityMap.contains("ambientLightMode")) {