diff options
| author | Juan Linietsky | 2017-07-19 17:00:46 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-07-19 17:06:03 -0300 |
| commit | 25678b1876816b9ccb14b2c92aef62f3b009f88f (patch) | |
| tree | 189f082d788f78e16f620b056d21249118883fc5 /servers/physics | |
| parent | 89588d43349e496a9e05756d42ae87323d31269e (diff) | |
| download | godot-25678b1876816b9ccb14b2c92aef62f3b009f88f.tar.gz godot-25678b1876816b9ccb14b2c92aef62f3b009f88f.tar.zst godot-25678b1876816b9ccb14b2c92aef62f3b009f88f.zip | |
-Renamed GlobalConfig to ProjectSettings, makes more sense.
-Added system for feature overrides, it's pretty cool :)
Diffstat (limited to 'servers/physics')
| -rw-r--r-- | servers/physics/space_sw.cpp | 2 | ||||
| -rw-r--r-- | servers/physics/space_sw.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics/space_sw.cpp b/servers/physics/space_sw.cpp index 2d71fd606..9e84fce00 100644 --- a/servers/physics/space_sw.cpp +++ b/servers/physics/space_sw.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "space_sw.h" #include "collision_solver_sw.h" -#include "global_config.h" +#include "project_settings.h" #include "physics_server_sw.h" _FORCE_INLINE_ static bool _match_object_type_query(CollisionObjectSW *p_object, uint32_t p_collision_layer, uint32_t p_type_mask) { diff --git a/servers/physics/space_sw.h b/servers/physics/space_sw.h index 6ef12dbea..6c6c43323 100644 --- a/servers/physics/space_sw.h +++ b/servers/physics/space_sw.h @@ -36,7 +36,7 @@ #include "body_sw.h" #include "broad_phase_sw.h" #include "collision_object_sw.h" -#include "global_config.h" +#include "project_settings.h" #include "hash_map.h" #include "typedefs.h" |