diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-22 21:39:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 21:39:48 +0200 |
| commit | 1f61d477662fdbbb43cd3703aaac2d25d1c19e3a (patch) | |
| tree | 645c01e9ca1dfa17e7cc37bcfe2697f30125bcb1 /scene/3d/physics_body_3d.cpp | |
| parent | 5bc8702855a92940bb5a56dd28660c86ee5c7b7a (diff) | |
| parent | 1a24c9e14bf1f9578eda338344c12faf66fb0e65 (diff) | |
| download | redot-engine-1f61d477662fdbbb43cd3703aaac2d25d1c19e3a.tar.gz | |
Merge pull request #64339 from YuriSizov/core-multilevel-validate-property
Diffstat (limited to 'scene/3d/physics_body_3d.cpp')
| -rw-r--r-- | scene/3d/physics_body_3d.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/scene/3d/physics_body_3d.cpp b/scene/3d/physics_body_3d.cpp index 7ecc073422..515665bde6 100644 --- a/scene/3d/physics_body_3d.cpp +++ b/scene/3d/physics_body_3d.cpp @@ -1124,13 +1124,12 @@ void RigidDynamicBody3D::_bind_methods() { BIND_ENUM_CONSTANT(DAMP_MODE_REPLACE); } -void RigidDynamicBody3D::_validate_property(PropertyInfo &property) const { +void RigidDynamicBody3D::_validate_property(PropertyInfo &p_property) const { if (center_of_mass_mode != CENTER_OF_MASS_MODE_CUSTOM) { - if (property.name == "center_of_mass") { - property.usage = PROPERTY_USAGE_NO_EDITOR; + if (p_property.name == "center_of_mass") { + p_property.usage = PROPERTY_USAGE_NO_EDITOR; } } - PhysicsBody3D::_validate_property(property); } RigidDynamicBody3D::RigidDynamicBody3D() : @@ -2022,13 +2021,12 @@ void CharacterBody3D::_bind_methods() { BIND_ENUM_CONSTANT(PLATFORM_VEL_ON_LEAVE_NEVER); } -void CharacterBody3D::_validate_property(PropertyInfo &property) const { +void CharacterBody3D::_validate_property(PropertyInfo &p_property) const { if (motion_mode == MOTION_MODE_FLOATING) { - if (property.name.begins_with("floor_") || property.name == "up_direction" || property.name == "slide_on_ceiling") { - property.usage = PROPERTY_USAGE_NO_EDITOR; + if (p_property.name.begins_with("floor_") || p_property.name == "up_direction" || p_property.name == "slide_on_ceiling") { + p_property.usage = PROPERTY_USAGE_NO_EDITOR; } } - PhysicsBody3D::_validate_property(property); } CharacterBody3D::CharacterBody3D() : |