don't require a style for composited layers

This commit is contained in:
Konstantin Käfer
2014-05-21 13:40:59 +02:00
parent 13939b26d9
commit 834ef2eee8
2 changed files with 6 additions and 2 deletions

View File

@@ -186,10 +186,14 @@ struct CompositeClass {
};
struct CompositeProperties {
inline CompositeProperties() {}
bool enabled = true;
float opacity = 1.0;
};
const CompositeProperties defaultCompositeProperties;
}
#endif

View File

@@ -545,8 +545,8 @@ void Map::renderLayer(const LayerDescription& layer_desc, RenderPass pass) {
// This is a layer group. We render them during our translucent render pass.
if (pass == Translucent) {
auto it = find_style(style.computed.composites, layer_desc);
if (it != style.computed.composites.end() && !is_invisible(it->second)) {
const CompositeProperties &properties = it->second;
const CompositeProperties &properties = (it != style.computed.composites.end()) ? it->second : defaultCompositeProperties;
if (!is_invisible(properties)) {
gl::group group(std::string("group: ") + layer_desc.name);
if (debug::renderTree) {