Solve merge conflict

modules/globebrowsing/globes/renderableglobe.cpp

@@ -67,6 +67,7 @@ namespace openspace {
         , _heightMapsSelection(properties::SelectionProperty("Height Maps", "Height Maps"))
         , _waterMasksSelection(properties::SelectionProperty("Water Masks", "Water Masks"))
         , _overlaysSelection(properties::SelectionProperty("Overlays", "Overlays"))
+        , _grayScaleOverlaysSelection(properties::SelectionProperty("GrayScaleOverlays", "GrayScaleOverlays"))
 
         , debugSelection(ReferencedBoolSelection("Debug", "Debug"))
 
@@ -75,6 +76,7 @@ namespace openspace {
         , blendNightTexture(properties::BoolProperty("blendNightTexture", "blendNightTexture", true))
         , blendOverlay(properties::BoolProperty("blendOverlay", "blendOverlay", true))
         , blendWaterMask(properties::BoolProperty("blendWaterMask", "blendWaterMask", true))
+        , blendGrayScaleOverlay(properties::BoolProperty("blendGrayScaleOverlay", "blendGrayScaleOverlay", true))
         , atmosphereEnabled(properties::BoolProperty("atmosphereEnabled", "atmosphereEnabled", false))
         , levelByProjArea(properties::BoolProperty("levelByProjArea", "levelByProjArea", true))
         , limitLevelByAvailableHeightData(properties::BoolProperty("limitLevelByAvailableHeightData", "limitLevelByAvailableHeightData", true))
@@ -93,6 +95,7 @@ namespace openspace {
         addProperty(_heightMapsSelection);
         addProperty(_waterMasksSelection);
         addProperty(_overlaysSelection);
+        addProperty(_grayScaleOverlaysSelection);
 
 
         addProperty(blendHeightMap);
@@ -100,6 +103,7 @@ namespace openspace {
         addProperty(blendNightTexture);
         addProperty(blendOverlay);
         addProperty(blendWaterMask);
+        addProperty(blendGrayScaleOverlay);
         addProperty(atmosphereEnabled);
 
 
@@ -134,12 +138,14 @@ namespace openspace {
         addToggleLayerProperties(LayeredTextures::HeightMaps, _heightMapsSelection);
         addToggleLayerProperties(LayeredTextures::WaterMasks, _waterMasksSelection);
         addToggleLayerProperties(LayeredTextures::Overlays, _overlaysSelection);
+        addToggleLayerProperties(LayeredTextures::GrayScaleOverlays, _grayScaleOverlaysSelection);
 
         _baseLayersSelection.onChange(std::bind(&RenderableGlobe::baseLayerSelectionChanged, this));
         _nightLayersSelection.onChange(std::bind(&RenderableGlobe::nightLayersSelectionChanged, this));
         _heightMapsSelection.onChange(std::bind(&RenderableGlobe::heightMapsSelectionChanged, this));
         _waterMasksSelection.onChange(std::bind(&RenderableGlobe::waterMasksSelectionChanged, this));
         _overlaysSelection.onChange(std::bind(&RenderableGlobe::overlaysSelectionChanged, this));
+        _grayScaleOverlaysSelection.onChange(std::bind(&RenderableGlobe::grayScaleOverlaysSelectionChanged, this));
 
         _chunkedLodGlobe = std::shared_ptr<ChunkedLodGlobe>(
             new ChunkedLodGlobe(_ellipsoid, patchSegments, _tileProviderManager));        
@@ -191,7 +197,10 @@ namespace openspace {
         initializeToggleLayerProperties(LayeredTextures::HeightMaps, _heightMapsSelection);
         initializeToggleLayerProperties(LayeredTextures::WaterMasks, _waterMasksSelection);
         initializeToggleLayerProperties(LayeredTextures::Overlays, _overlaysSelection);
+        initializeToggleLayerProperties(LayeredTextures::GrayScaleOverlays, _grayScaleOverlaysSelection);
+
         debugSelection.initialize();
+
         return _distanceSwitch.initialize();
     }
 
@@ -241,11 +250,14 @@ namespace openspace {
         _chunkedLodGlobe->blendProperties[LayeredTextures::NightTextures] = blendNightTexture.value();
         _chunkedLodGlobe->blendProperties[LayeredTextures::Overlays] = blendOverlay.value();
         _chunkedLodGlobe->blendProperties[LayeredTextures::WaterMasks] = blendWaterMask.value();
+        _chunkedLodGlobe->blendProperties[LayeredTextures::GrayScaleOverlays] = blendGrayScaleOverlay.value();
         _chunkedLodGlobe->atmosphereEnabled = atmosphereEnabled.value();
 
         _chunkedLodGlobe->levelByProjArea = levelByProjArea.value();
         _chunkedLodGlobe->limitLevelByAvailableHeightData = limitLevelByAvailableHeightData.value();
 
+
+        // Update this after active layers have been updated
         _tileProviderManager->prerender();
     }
 
@@ -298,5 +310,10 @@ namespace openspace {
         selectionChanged(_overlaysSelection, LayeredTextures::Overlays);
     }
 
+    void RenderableGlobe::grayScaleOverlaysSelectionChanged()
+    {
+        selectionChanged(_grayScaleOverlaysSelection, LayeredTextures::GrayScaleOverlays);
+    }
+
 }  // namespace openspace