diff options
| -rw-r--r-- | modules/arkit/arkit_interface.mm | 2 | ||||
| -rw-r--r-- | platform/osx/display_server_osx.mm | 2 | ||||
| -rw-r--r-- | scene/2d/physics_body_2d.cpp | 2 | ||||
| -rw-r--r-- | scene/3d/physics_body_3d.cpp | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/modules/arkit/arkit_interface.mm b/modules/arkit/arkit_interface.mm index 90d9d7b03a..031e1e115e 100644 --- a/modules/arkit/arkit_interface.mm +++ b/modules/arkit/arkit_interface.mm @@ -31,7 +31,7 @@ #include "core/input/input_filter.h" #include "core/os/os.h" #include "scene/resources/surface_tool.h" -#include "servers/visual/visual_server_globals.h" +#include "servers/rendering/rendering_server_globals.h" #import <ARKit/ARKit.h> #import <UIKit/UIKit.h> diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm index 3bdd12ec9d..074fc3be0d 100644 --- a/platform/osx/display_server_osx.mm +++ b/platform/osx/display_server_osx.mm @@ -50,7 +50,7 @@ #endif #if defined(VULKAN_ENABLED) -#include "servers/visual/rasterizer_rd/rasterizer_rd.h" +#include "servers/rendering/rasterizer_rd/rasterizer_rd.h" #include <QuartzCore/CAMetalLayer.h> #endif diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index 289860d9c6..fe91e63792 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -373,7 +373,7 @@ void RigidBody2D::_direct_state_changed(Object *p_state) { #ifdef DEBUG_ENABLED state = Object::cast_to<PhysicsDirectBodyState2D>(p_state); #else - state = (Physics2DDirectBodyState *)p_state; //trust it + state = (PhysicsDirectBodyState2D *)p_state; //trust it #endif set_block_transform_notify(true); // don't want notify (would feedback loop) diff --git a/scene/3d/physics_body_3d.cpp b/scene/3d/physics_body_3d.cpp index 1f3e2b8373..680d6e8594 100644 --- a/scene/3d/physics_body_3d.cpp +++ b/scene/3d/physics_body_3d.cpp @@ -374,7 +374,7 @@ void RigidBody3D::_direct_state_changed(Object *p_state) { #ifdef DEBUG_ENABLED state = Object::cast_to<PhysicsDirectBodyState3D>(p_state); #else - state = (PhysicsDirectBodyState *)p_state; //trust it + state = (PhysicsDirectBodyState3D *)p_state; //trust it #endif set_ignore_transform_notification(true); @@ -1300,7 +1300,7 @@ void KinematicBody3D::_direct_state_changed(Object *p_state) { #ifdef DEBUG_ENABLED PhysicsDirectBodyState3D *state = Object::cast_to<PhysicsDirectBodyState3D>(p_state); #else - PhysicsDirectBodyState *state = (PhysicsDirectBodyState *)p_state; //trust it + PhysicsDirectBodyState3D *state = (PhysicsDirectBodyState3D *)p_state; //trust it #endif linear_velocity = state->get_linear_velocity(); @@ -2106,7 +2106,7 @@ void PhysicalBone3D::_direct_state_changed(Object *p_state) { #ifdef DEBUG_ENABLED state = Object::cast_to<PhysicsDirectBodyState3D>(p_state); #else - state = (PhysicsDirectBodyState *)p_state; //trust it + state = (PhysicsDirectBodyState3D *)p_state; //trust it #endif Transform global_transform(state->get_transform()); |