diff options
author | Karim Naaji <karim.naaji@gmail.com> | 2020-06-01 17:35:09 -0700 |
---|---|---|
committer | Karim Naaji <karim.naaji@gmail.com> | 2020-06-01 17:35:09 -0700 |
commit | 5ae995867b6fbc0d2e14b696bae580eb8ba3e5ef (patch) | |
tree | 112e36f17a9b75d3b596426c234e93e7360126c8 /src/mbgl/style/paint_property.hpp | |
parent | 2dfd8ba452ce1528965ea6bef3355e0f970142ec (diff) | |
download | qtlocation-mapboxgl-5ae995867b6fbc0d2e14b696bae580eb8ba3e5ef.tar.gz |
WIP Save stashupstream/karim/gl-js-port
Diffstat (limited to 'src/mbgl/style/paint_property.hpp')
-rw-r--r-- | src/mbgl/style/paint_property.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp index 7d398748f2..76a62f3946 100644 --- a/src/mbgl/style/paint_property.hpp +++ b/src/mbgl/style/paint_property.hpp @@ -41,7 +41,7 @@ public: using UniformList = TypeList<U>; }; -template <class T, class A1, class U1, class A2, class U2> +template <class T, class A1, class U1, class A2, class U2, class A3, class U3, class A4, class U4> class CrossFadedDataDrivenPaintProperty { public: using TransitionableType = Transitionable<PropertyValue<T>>; @@ -53,9 +53,9 @@ public: static constexpr bool IsOverridable = false; using Attribute = A1; - using AttributeList = TypeList<A1, A2>; + using AttributeList = TypeList<A1, A2, A3, A4>; using Uniform = U1; - using UniformList = TypeList<U1, U2>; + using UniformList = TypeList<U1, U2, U3, U4>; }; template <class T> |