noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #64339 from YuriSizov/core-multilevel-validate-property

Browse Source
This commit is contained in:
Rémi Verschelde
2022-08-22 21:39:48 +02:00
committed by GitHub
parent 5bc8702855 1a24c9e14b
commit 1f61d47766
135 changed files with 770 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scene/3d/skeleton_3d.cpp
View File

@@ -176,39 +176,37 @@ void Skeleton3D::_get_property_list(List<PropertyInfo> *p_list) const {
}
}
void Skeleton3D::_validate_property(PropertyInfo &property) const {
PackedStringArray split = property.name.split("/");
void Skeleton3D::_validate_property(PropertyInfo &p_property) const {
PackedStringArray split = p_property.name.split("/");
if (split.size() == 3 && split[0] == "bones") {
if (split[2] == "rest") {
property.usage |= PROPERTY_USAGE_READ_ONLY;
p_property.usage |= PROPERTY_USAGE_READ_ONLY;
}
if (is_show_rest_only()) {
if (split[2] == "enabled") {
property.usage |= PROPERTY_USAGE_READ_ONLY;
p_property.usage |= PROPERTY_USAGE_READ_ONLY;
}
if (split[2] == "position") {
property.usage |= PROPERTY_USAGE_READ_ONLY;
p_property.usage |= PROPERTY_USAGE_READ_ONLY;
}
if (split[2] == "rotation") {
property.usage |= PROPERTY_USAGE_READ_ONLY;
p_property.usage |= PROPERTY_USAGE_READ_ONLY;
}
if (split[2] == "scale") {
property.usage |= PROPERTY_USAGE_READ_ONLY;
p_property.usage |= PROPERTY_USAGE_READ_ONLY;
}
} else if (!is_bone_enabled(split[1].to_int())) {
if (split[2] == "position") {
property.usage |= PROPERTY_USAGE_READ_ONLY;
p_property.usage |= PROPERTY_USAGE_READ_ONLY;
}
if (split[2] == "rotation") {
property.usage |= PROPERTY_USAGE_READ_ONLY;
p_property.usage |= PROPERTY_USAGE_READ_ONLY;
}
if (split[2] == "scale") {
property.usage |= PROPERTY_USAGE_READ_ONLY;
p_property.usage |= PROPERTY_USAGE_READ_ONLY;
}
}
}
Node3D::_validate_property(property);
}
void Skeleton3D::_update_process_order() {