diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-13 08:49:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 08:49:39 +0100 |
| commit | 55ca2a7c88503d0f07785ab9215809b02027f858 (patch) | |
| tree | dff95ace09acaa882c74f77f1036b05c7e4a360b /core/math | |
| parent | a18ceb6a302b23094136adfc9591121f8b49a8cf (diff) | |
| parent | fe7e11e008598e4bbbe46cf817af2fac999a5326 (diff) | |
Merge pull request #25821 from akien-mga/sync-class-and-filenames
Ensure classes match their header filename
Diffstat (limited to 'core/math')
| -rw-r--r-- | core/math/bsp_tree.h | 2 | ||||
| -rw-r--r-- | core/math/geometry.h | 2 | ||||
| -rw-r--r-- | core/math/triangle_mesh.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/math/bsp_tree.h b/core/math/bsp_tree.h index 0af532a2d5..a7a3697990 100644 --- a/core/math/bsp_tree.h +++ b/core/math/bsp_tree.h @@ -31,11 +31,11 @@ #ifndef BSP_TREE_H #define BSP_TREE_H -#include "core/dvector.h" #include "core/math/aabb.h" #include "core/math/face3.h" #include "core/math/plane.h" #include "core/method_ptrcall.h" +#include "core/pool_vector.h" #include "core/variant.h" #include "core/vector.h" /** diff --git a/core/math/geometry.h b/core/math/geometry.h index 29493516b8..f927a63ed5 100644 --- a/core/math/geometry.h +++ b/core/math/geometry.h @@ -31,12 +31,12 @@ #ifndef GEOMETRY_H #define GEOMETRY_H -#include "core/dvector.h" #include "core/math/face3.h" #include "core/math/rect2.h" #include "core/math/triangulate.h" #include "core/math/vector3.h" #include "core/object.h" +#include "core/pool_vector.h" #include "core/print_string.h" #include "core/vector.h" diff --git a/core/math/triangle_mesh.cpp b/core/math/triangle_mesh.cpp index cdf3d16b72..83784a1fa7 100644 --- a/core/math/triangle_mesh.cpp +++ b/core/math/triangle_mesh.cpp @@ -30,7 +30,7 @@ #include "triangle_mesh.h" -#include "core/sort.h" +#include "core/sort_array.h" int TriangleMesh::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, int p_depth, int &max_depth, int &max_alloc) { |