summaryrefslogtreecommitdiff
path: root/servers
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-01-28 16:50:25 +0100
committerRémi Verschelde <rverschelde@gmail.com>2019-01-28 16:51:03 +0100
commit5876c3f089da4f69a1279f69eb9229bced13cde2 (patch)
tree9fb548d7037d399301895b4db19db90d7c7fba1f /servers
parentac01aef9e3e9839809306efc915f6e4fa4ac303f (diff)
Revert " Deprecated Godot 3D physics engine"
This reverts commit 5de5a4140b9a397935737c6ce0088602be6840d7. @reduz still intends to rework it in the future, and it's convenient to test if issues are specific to Bullet or not, so we keep it around for the time being.
Diffstat (limited to 'servers')
-rw-r--r--servers/register_server_types.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp
index 0c43000186..4e167be300 100644
--- a/servers/register_server_types.cpp
+++ b/servers/register_server_types.cpp
@@ -81,7 +81,6 @@ static void _debugger_get_resource_usage(List<ScriptDebuggerRemote::ResourceUsag
ShaderTypes *shader_types = NULL;
PhysicsServer *_createGodotPhysicsCallback() {
- WARN_PRINT("The GodotPhysics 3D physics engine is deprecated and will be removed in Godot 3.2. You should use the Bullet physics engine instead (configurable in your project settings).");
return memnew(PhysicsServerSW);
}
@@ -167,8 +166,8 @@ void register_server_types() {
GLOBAL_DEF(PhysicsServerManager::setting_property_name, "DEFAULT");
ProjectSettings::get_singleton()->set_custom_property_info(PhysicsServerManager::setting_property_name, PropertyInfo(Variant::STRING, PhysicsServerManager::setting_property_name, PROPERTY_HINT_ENUM, "DEFAULT"));
- PhysicsServerManager::register_server("GodotPhysics - deprecated", &_createGodotPhysicsCallback);
- PhysicsServerManager::set_default_server("GodotPhysics - deprecated");
+ PhysicsServerManager::register_server("GodotPhysics", &_createGodotPhysicsCallback);
+ PhysicsServerManager::set_default_server("GodotPhysics");
}
void unregister_server_types() {