diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-16 13:01:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 13:01:42 +0200 |
| commit | df3fe9d781c820f537afa3053fd9b0281d51d4d4 (patch) | |
| tree | 3bd0426a8c27f3e3a01647a22b396232957e7d8e | |
| parent | 32afd19541914a2da94cf437b5aea0c2ebd12bc2 (diff) | |
| parent | 55c8fda8842f3b6dd3c4d8f029401dc80a585603 (diff) | |
Merge pull request #22980 from CakHuri/remove-include-dupl
Removed duplication of include(s)
| -rw-r--r-- | drivers/gles2/rasterizer_storage_gles2.h | 1 | ||||
| -rw-r--r-- | servers/physics/collision_solver_sw.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gles2/rasterizer_storage_gles2.h b/drivers/gles2/rasterizer_storage_gles2.h index b42e2dfb1f..c928f753b1 100644 --- a/drivers/gles2/rasterizer_storage_gles2.h +++ b/drivers/gles2/rasterizer_storage_gles2.h @@ -43,7 +43,6 @@ /* #include "shaders/blend_shape.glsl.gen.h" #include "shaders/canvas.glsl.gen.h" -#include "shaders/copy.glsl.gen.h" #include "shaders/particles.glsl.gen.h" */ diff --git a/servers/physics/collision_solver_sw.cpp b/servers/physics/collision_solver_sw.cpp index 2f2f6d2908..86ef719f6f 100644 --- a/servers/physics/collision_solver_sw.cpp +++ b/servers/physics/collision_solver_sw.cpp @@ -31,7 +31,6 @@ #include "collision_solver_sw.h" #include "collision_solver_sat.h" -#include "collision_solver_sat.h" #include "gjk_epa.h" #define collision_solver sat_calculate_penetration |