summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-14 21:56:22 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-14 21:57:22 -0300
commit5dde810aa58d66677afda9cc5c89c052e91348b4 (patch)
tree8d4e996125ab529260aaae9c396456ae2c66e094 /scene/resources
parenta1d07fd6d6a21ca6a3366aa7c9024dc41e3d323c (diff)
no more errors related to missing GlobalConfig::Get (or so I hope)
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/world_2d.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp
index 98c5ae3bb9..a8a87543c6 100644
--- a/scene/resources/world_2d.cpp
+++ b/scene/resources/world_2d.cpp
@@ -406,12 +406,6 @@ World2D::World2D() {
Physics2DServer::get_singleton()->space_set_active(space,true);
Physics2DServer::get_singleton()->area_set_param(space,Physics2DServer::AREA_PARAM_GRAVITY,GLOBAL_DEF("physics/2d/default_gravity",98));
Physics2DServer::get_singleton()->area_set_param(space,Physics2DServer::AREA_PARAM_GRAVITY_VECTOR,GLOBAL_DEF("physics/2d/default_gravity_vector",Vector2(0,1)));
- // TODO: Remove this deprecation warning and compatibility code for 2.2 or 3.0
- if (GlobalConfig::get_singleton()->get("physics/2d/default_density") && !GlobalConfig::get_singleton()->get("physics/2d/default_linear_damp")) {
- WARN_PRINT("Deprecated parameter 'physics/2d/default_density'. It was renamed to 'physics/2d/default_linear_damp', adjusting your project settings accordingly (make sure to adjust scripts that potentially rely on 'physics/2d/default_density'.");
- GlobalConfig::get_singleton()->set("physics/2d/default_linear_damp", GlobalConfig::get_singleton()->get("physics/2d/default_density"));
- GlobalConfig::get_singleton()->save();
- }
Physics2DServer::get_singleton()->area_set_param(space,Physics2DServer::AREA_PARAM_LINEAR_DAMP,GLOBAL_DEF("physics/2d/default_linear_damp",0.1));
Physics2DServer::get_singleton()->area_set_param(space,Physics2DServer::AREA_PARAM_ANGULAR_DAMP,GLOBAL_DEF("physics/2d/default_angular_damp",1));
indexer = memnew( SpatialIndexer2D );