diff options
| author | Langston Smith <langston.smith@mapbox.com> | 2018-03-05 17:56:29 -0800 |
|---|---|---|
| committer | Langston Smith <langston.smith@mapbox.com> | 2018-03-05 17:56:29 -0800 |
| commit | aab4b971509f6f76943e2578cb13addc13ae079b (patch) | |
| tree | f671cbf3dc5c7d5078423704df165eeb070f4d0f /src/mbgl/programs/collision_box_program.hpp | |
| parent | 6996e2d81abb8ea2ad23a6efe1502809bbe7e882 (diff) | |
| parent | 136e536159a1e22aa4a92c4e6463893600b809d0 (diff) | |
| download | qtlocation-mapboxgl-aab4b971509f6f76943e2578cb13addc13ae079b.tar.gz | |
Merge branch 'master' into ls-android-readme-snapshot-dependency-line-cleanup
Diffstat (limited to 'src/mbgl/programs/collision_box_program.hpp')
| -rw-r--r-- | src/mbgl/programs/collision_box_program.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp index 8d712a3df3..6e75adf36e 100644 --- a/src/mbgl/programs/collision_box_program.hpp +++ b/src/mbgl/programs/collision_box_program.hpp @@ -110,6 +110,7 @@ class CollisionCircleProgram : public Program< gl::Uniforms< uniforms::u_matrix, uniforms::u_extrude_scale, + uniforms::u_overscale_factor, uniforms::u_camera_to_center_distance>, style::Properties<>> { |