[core] Unify {Paint,Layout,Light}Properties

2017-05-10 11:34:00 -07:00
parent 2690a65f8d
commit da4d735e2c
66 changed files with 493 additions and 575 deletions
--- a/src/mbgl/programs/debug_program.hpp
+++ b/src/mbgl/programs/debug_program.hpp
@@ -4,6 +4,7 @@
 #include <mbgl/programs/attributes.hpp>
 #include <mbgl/programs/uniforms.hpp>
 #include <mbgl/shaders/debug.hpp>
+#include <mbgl/style/properties.hpp>

 namespace mbgl {

@@ -15,7 +16,7 @@ class DebugProgram : public Program<
    gl::Uniforms<
        uniforms::u_matrix,
        uniforms::u_color>,
-    style::PaintProperties<>>
+    style::Properties<>>
 {
 public:
    using Program::Program;