diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2015-02-04 11:05:36 -0800 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2015-02-04 11:05:36 -0800 |
| commit | 465b1ac3eb45cbb946476ca73f421f02da225175 (patch) | |
| tree | e7d29cf8f969250c1e94479b8778e52e10e0af9e /src/mbgl/style/property_value.hpp | |
| parent | c9f8de863dc93e4fd587290357c8a3b572a4f956 (diff) | |
| parent | 002a709b67ac1ac36d4711a913a3fc082494ff71 (diff) | |
| download | qtlocation-mapboxgl-465b1ac3eb45cbb946476ca73f421f02da225175.tar.gz | |
Merge branch 'master' into pattern-functions
Conflicts:
src/mbgl/renderer/painter.cpp
src/mbgl/renderer/painter.hpp
src/mbgl/renderer/painter_fill.cpp
src/mbgl/renderer/painter_line.cpp
src/mbgl/style/style_layer.cpp
src/mbgl/style/style_layer.hpp
src/mbgl/style/style_layer_group.cpp
src/mbgl/style/style_layer_group.hpp
Diffstat (limited to 'src/mbgl/style/property_value.hpp')
| -rw-r--r-- | src/mbgl/style/property_value.hpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/mbgl/style/property_value.hpp b/src/mbgl/style/property_value.hpp index 8dcb8d7371..49e837cf12 100644 --- a/src/mbgl/style/property_value.hpp +++ b/src/mbgl/style/property_value.hpp @@ -14,6 +14,15 @@ typedef mapbox::util::variant< std::string, TranslateAnchorType, RotateAnchorType, + bool, + CapType, + JoinType, + VisibilityType, + PlacementType, + RotationAlignmentType, + TextTransformType, + TextJustifyType, + TextAnchorType, Function<bool>, Function<float>, Function<Color>, |