diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-23 12:27:55 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-23 12:27:55 +0200 |
| commit | dd71bc2d3b613d3c63f75e671f36427f838f7396 (patch) | |
| tree | ea7cd64ed911afa1010264ff3ecec4d9cf409b93 /servers/physics_server_3d.cpp | |
| parent | 1b19ecb360124b4f46d767e56b8f8d9a1f1ed20e (diff) | |
| parent | 0333648cea0483edce0131722789b54d4daa7d5a (diff) | |
| download | redot-engine-dd71bc2d3b613d3c63f75e671f36427f838f7396.tar.gz | |
Merge pull request #95252 from rburing/3d_physics_module
Move Godot Physics 3D into a module; add dummy 3D physics server
Diffstat (limited to 'servers/physics_server_3d.cpp')
| -rw-r--r-- | servers/physics_server_3d.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/servers/physics_server_3d.cpp b/servers/physics_server_3d.cpp index 698805bbdd..ee48151863 100644 --- a/servers/physics_server_3d.cpp +++ b/servers/physics_server_3d.cpp @@ -1201,7 +1201,9 @@ String PhysicsServer3DManager::get_server_name(int p_id) { } PhysicsServer3D *PhysicsServer3DManager::new_default_server() { - ERR_FAIL_COND_V(default_server_id == -1, nullptr); + if (default_server_id == -1) { + return nullptr; + } Variant ret; Callable::CallError ce; physics_servers[default_server_id].create_callback.callp(nullptr, 0, ret, ce); |