From 5d0deaf9462201848a86f3f8763e0dae20e4cec4 Mon Sep 17 00:00:00 2001 From: Nissim Date: Fri, 20 Oct 2017 14:27:27 -0700 Subject: [PATCH] Code review fixes. --- libraries/entities/src/EntityItemProperties.cpp | 4 ++-- libraries/entities/src/ZoneEntityItem.cpp | 5 +---- libraries/model/src/model/Stage.cpp | 5 +---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index adcfa412cf..51ed66bb23 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -232,7 +232,7 @@ QString EntityItemProperties::getHazeModeAsString() const { if (_hazeMode < COMPONENT_MODE_ITEM_COUNT) { return COMPONENT_MODES[_hazeMode].second; } else { - return COMPONENT_MODES[0].second; + return COMPONENT_MODES[COMPONENT_MODE_INHERIT].second; } } @@ -241,7 +241,7 @@ QString EntityItemProperties::getHazeModeString(uint32_t mode) { if (mode < COMPONENT_MODE_ITEM_COUNT) { return COMPONENT_MODES[mode].second; } else { - return COMPONENT_MODES[0].second; + return COMPONENT_MODES[COMPONENT_MODE_INHERIT].second; } } diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp index 4b1bf53bcc..588c1f9386 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp +++ b/libraries/entities/src/ZoneEntityItem.cpp @@ -323,11 +323,8 @@ void ZoneEntityItem::resetRenderingPropertiesChanged() { void ZoneEntityItem::setHazeMode(const uint32_t value) { if (value < COMPONENT_MODE_ITEM_COUNT) { _hazeMode = value; - } else { - _hazeMode = 0; + _hazePropertiesChanged = true; } - - _hazePropertiesChanged = true; } uint32_t ZoneEntityItem::getHazeMode() const { diff --git a/libraries/model/src/model/Stage.cpp b/libraries/model/src/model/Stage.cpp index 189aa9a184..cd2312122c 100644 --- a/libraries/model/src/model/Stage.cpp +++ b/libraries/model/src/model/Stage.cpp @@ -260,9 +260,6 @@ void SunSkyStage::setSkybox(const SkyboxPointer& skybox) { void SunSkyStage::setHazeMode(uint32_t hazeMode) { if (hazeMode < COMPONENT_MODE_ITEM_COUNT) { _hazeMode = hazeMode; - } else { - _hazeMode = 0; + invalidate(); } - - invalidate(); }