Merge pull request #22980 from CakHuri/remove-include-dupl

Removed duplication of include(s)
2018-10-16 13:01:42 +02:00
parent 32afd19541 55c8fda884
commit df3fe9d781
2 changed files with 0 additions and 2 deletions
--- 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"
 */

--- 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