diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-27 22:14:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 22:14:50 +0100 |
| commit | fcfffd729789cd80aa77056ca089697b52297d04 (patch) | |
| tree | fc1bb58e900436c48c03c52106eb57250442ae35 /scene/resources/shape_3d.cpp | |
| parent | 307b1b3a5835ecdb477859785c673a07e248f904 (diff) | |
| parent | a6f3bc7c696af03e3875f78e098d2476e409d15e (diff) | |
Merge pull request #37361 from reduz/server-renames
Renaming of servers for coherency.
Diffstat (limited to 'scene/resources/shape_3d.cpp')
| -rw-r--r-- | scene/resources/shape_3d.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/shape_3d.cpp b/scene/resources/shape_3d.cpp index c3aeba857a..f4a5d91e52 100644 --- a/scene/resources/shape_3d.cpp +++ b/scene/resources/shape_3d.cpp @@ -33,7 +33,7 @@ #include "core/os/os.h" #include "scene/main/scene_tree.h" #include "scene/resources/mesh.h" -#include "servers/physics_server.h" +#include "servers/physics_server_3d.h" void Shape3D::add_vertices_to_array(Vector<Vector3> &array, const Transform &p_xform) { @@ -56,7 +56,7 @@ real_t Shape3D::get_margin() const { void Shape3D::set_margin(real_t p_margin) { margin = p_margin; - PhysicsServer::get_singleton()->shape_set_margin(shape, margin); + PhysicsServer3D::get_singleton()->shape_set_margin(shape, margin); } Ref<ArrayMesh> Shape3D::get_debug_mesh() { @@ -123,5 +123,5 @@ Shape3D::Shape3D(RID p_shape) : Shape3D::~Shape3D() { - PhysicsServer::get_singleton()->free(shape); + PhysicsServer3D::get_singleton()->free(shape); } |