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/types.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/types.hpp')
| -rw-r--r-- | src/mbgl/style/types.hpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/mbgl/style/types.hpp b/src/mbgl/style/types.hpp index cd9c29d30a..b7d675857a 100644 --- a/src/mbgl/style/types.hpp +++ b/src/mbgl/style/types.hpp @@ -72,18 +72,6 @@ MBGL_DEFINE_ENUM_CLASS(VisibilityTypeClass, VisibilityType, { // ------------------------------------------------------------------------------------------------- -enum class WindingType : bool { - EvenOdd, - NonZero, -}; - -MBGL_DEFINE_ENUM_CLASS(WindingTypeClass, WindingType, { - { WindingType::EvenOdd, "even-odd" }, - { WindingType::NonZero, "non-zero" }, -}); - -// ------------------------------------------------------------------------------------------------- - enum class CapType : uint8_t { Round, Butt, |