asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #37372 from dankan1890/quick_fix

Browse source 
Fixed probable typo in renaming.
This commit is contained in:
Rémi Verschelde 2020-03-28 12:57:13 +01:00 committed by GitHub
commit bbbdabc771
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/arkit/arkit_interface.mm
View file

@ -31,7 +31,7 @@
#include "core/input/input_filter.h" #include "core/input/input_filter.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "scene/resources/surface_tool.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 <ARKit/ARKit.h>
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>

2
platform/osx/display_server_osx.mm
View file

@ -50,7 +50,7 @@
#endif #endif
#if defined(VULKAN_ENABLED) #if defined(VULKAN_ENABLED)
#include "servers/visual/rasterizer_rd/rasterizer_rd.h" #include "servers/rendering/rasterizer_rd/rasterizer_rd.h"
#include <QuartzCore/CAMetalLayer.h> #include <QuartzCore/CAMetalLayer.h>
#endif #endif

2
scene/2d/physics_body_2d.cpp
View file

@ -373,7 +373,7 @@ void RigidBody2D::_direct_state_changed(Object *p_state) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
state = Object::cast_to<PhysicsDirectBodyState2D>(p_state); state = Object::cast_to<PhysicsDirectBodyState2D>(p_state);
#else #else
state = (Physics2DDirectBodyState *)p_state; //trust it state = (PhysicsDirectBodyState2D *)p_state; //trust it
#endif #endif
set_block_transform_notify(true); // don't want notify (would feedback loop) set_block_transform_notify(true); // don't want notify (would feedback loop)

6
scene/3d/physics_body_3d.cpp
View file

@ -374,7 +374,7 @@ void RigidBody3D::_direct_state_changed(Object *p_state) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
state = Object::cast_to<PhysicsDirectBodyState3D>(p_state); state = Object::cast_to<PhysicsDirectBodyState3D>(p_state);
#else #else
state = (PhysicsDirectBodyState *)p_state; //trust it state = (PhysicsDirectBodyState3D *)p_state; //trust it
#endif #endif
set_ignore_transform_notification(true); set_ignore_transform_notification(true);
@ -1300,7 +1300,7 @@ void KinematicBody3D::_direct_state_changed(Object *p_state) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
PhysicsDirectBodyState3D *state = Object::cast_to<PhysicsDirectBodyState3D>(p_state); PhysicsDirectBodyState3D *state = Object::cast_to<PhysicsDirectBodyState3D>(p_state);
#else #else
PhysicsDirectBodyState *state = (PhysicsDirectBodyState *)p_state; //trust it PhysicsDirectBodyState3D *state = (PhysicsDirectBodyState3D *)p_state; //trust it
#endif #endif
linear_velocity = state->get_linear_velocity(); linear_velocity = state->get_linear_velocity();
@ -2106,7 +2106,7 @@ void PhysicalBone3D::_direct_state_changed(Object *p_state) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
state = Object::cast_to<PhysicsDirectBodyState3D>(p_state); state = Object::cast_to<PhysicsDirectBodyState3D>(p_state);
#else #else
state = (PhysicsDirectBodyState *)p_state; //trust it state = (PhysicsDirectBodyState3D *)p_state; //trust it
#endif #endif
Transform global_transform(state->get_transform()); Transform global_transform(state->get_transform());