From 672eb610799c95aad37fe62eccdd11eca1e5e8f7 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 23 May 2016 15:39:47 -0700
Subject: [PATCH] =?UTF-8?q?[core]=20box=5Fshader=20=E2=87=A2=20collision?=
 =?UTF-8?q?=5Fbox=5Fshader?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mbgl/renderer/painter.cpp                                | 2 +-
 src/mbgl/renderer/painter_symbol.cpp                         | 2 +-
 src/mbgl/renderer/symbol_bucket.cpp                          | 2 +-
 src/mbgl/shader/{box_shader.cpp => collision_box_shader.cpp} | 2 +-
 src/mbgl/shader/{box_shader.hpp => collision_box_shader.hpp} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/mbgl/shader/{box_shader.cpp => collision_box_shader.cpp} (95%)
 rename src/mbgl/shader/{box_shader.hpp => collision_box_shader.hpp} (100%)

diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index 51c85b39b..a3ca2b085 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -27,7 +27,7 @@
 #include <mbgl/shader/icon_shader.hpp>
 #include <mbgl/shader/raster_shader.hpp>
 #include <mbgl/shader/sdf_shader.hpp>
-#include <mbgl/shader/box_shader.hpp>
+#include <mbgl/shader/collision_box_shader.hpp>
 #include <mbgl/shader/circle_shader.hpp>
 
 #include <mbgl/algorithm/generate_clip_ids.hpp>
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp
index de3f10957..5e23a835d 100644
--- a/src/mbgl/renderer/painter_symbol.cpp
+++ b/src/mbgl/renderer/painter_symbol.cpp
@@ -5,7 +5,7 @@
 #include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/shader/sdf_shader.hpp>
 #include <mbgl/shader/icon_shader.hpp>
-#include <mbgl/shader/box_shader.hpp>
+#include <mbgl/shader/collision_box_shader.hpp>
 #include <mbgl/util/math.hpp>
 
 #include <cmath>
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index 3588b2ed5..aaaa6d21d 100644
--- a/src/mbgl/renderer/symbol_bucket.cpp
+++ b/src/mbgl/renderer/symbol_bucket.cpp
@@ -17,7 +17,7 @@
 #include <mbgl/text/collision_tile.hpp>
 #include <mbgl/shader/sdf_shader.hpp>
 #include <mbgl/shader/icon_shader.hpp>
-#include <mbgl/shader/box_shader.hpp>
+#include <mbgl/shader/collision_box_shader.hpp>
 
 #include <mbgl/util/utf.hpp>
 #include <mbgl/util/token.hpp>
diff --git a/src/mbgl/shader/box_shader.cpp b/src/mbgl/shader/collision_box_shader.cpp
similarity index 95%
rename from src/mbgl/shader/box_shader.cpp
rename to src/mbgl/shader/collision_box_shader.cpp
index 63f800ea6..7a4723dbb 100644
--- a/src/mbgl/shader/box_shader.cpp
+++ b/src/mbgl/shader/collision_box_shader.cpp
@@ -1,4 +1,4 @@
-#include <mbgl/shader/box_shader.hpp>
+#include <mbgl/shader/collision_box_shader.hpp>
 #include <mbgl/shader/box.vertex.hpp>
 #include <mbgl/shader/box.fragment.hpp>
 #include <mbgl/gl/gl.hpp>
diff --git a/src/mbgl/shader/box_shader.hpp b/src/mbgl/shader/collision_box_shader.hpp
similarity index 100%
rename from src/mbgl/shader/box_shader.hpp
rename to src/mbgl/shader/collision_box_shader.hpp