diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 15:18:30 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 15:18:30 +0200 |
| commit | 087d04292a844fbfdb8d65457b1d44456e51c631 (patch) | |
| tree | d8849a40764a09a53cd0920e8f5bdd87c65d9001 /include/mbgl/style | |
| parent | 905c4294be495d15591885a2438ca0b8abc8decf (diff) | |
| parent | 253bbd1c5b5c5ae4a7bdbf731f58efa08d8cf855 (diff) | |
| download | qtlocation-mapboxgl-087d04292a844fbfdb8d65457b1d44456e51c631.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native
Diffstat (limited to 'include/mbgl/style')
| -rw-r--r-- | include/mbgl/style/property_key.hpp | 3 | ||||
| -rw-r--r-- | include/mbgl/style/style_properties.hpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/mbgl/style/property_key.hpp b/include/mbgl/style/property_key.hpp index 28aa800607..cbf9ad2ac5 100644 --- a/include/mbgl/style/property_key.hpp +++ b/include/mbgl/style/property_key.hpp @@ -61,7 +61,8 @@ enum class PropertyKey { RasterFade, BackgroundOpacity, - BackgroundColor + BackgroundColor, + BackgroundImage }; } diff --git a/include/mbgl/style/style_properties.hpp b/include/mbgl/style/style_properties.hpp index 20200a0dd7..0a5e993411 100644 --- a/include/mbgl/style/style_properties.hpp +++ b/include/mbgl/style/style_properties.hpp @@ -94,6 +94,7 @@ struct BackgroundProperties { inline BackgroundProperties() {} float opacity = 1.0f; Color color = {{ 0, 0, 0, 1 }}; + std::string image; }; typedef mapbox::util::variant< |