diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-27 17:45:48 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-27 17:45:48 +0200 |
commit | e65459294c84ece60a66323a1e1a99da31d783bc (patch) | |
tree | e5096f42616c1034065713ab714699cb7bce55cc | |
parent | a725e847ea533e09d9068f155ae59e24767d256e (diff) | |
parent | b04cf8486d5e504976045429ae2e04882bcd62dc (diff) | |
download | redot-engine-e65459294c84ece60a66323a1e1a99da31d783bc.tar.gz |
Merge pull request #84054 from AThousandShips/mesh_fix
Fix invalid return from some `_get/_set`
-rw-r--r-- | scene/resources/bone_map.cpp | 4 | ||||
-rw-r--r-- | scene/resources/mesh.cpp | 2 | ||||
-rw-r--r-- | scene/resources/skeleton_modification_stack_2d.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scene/resources/bone_map.cpp b/scene/resources/bone_map.cpp index 759d189bfa..5363b8ec79 100644 --- a/scene/resources/bone_map.cpp +++ b/scene/resources/bone_map.cpp @@ -37,7 +37,7 @@ bool BoneMap::_set(const StringName &p_path, const Variant &p_value) { set_skeleton_bone_name(which, p_value); return true; } - return true; + return false; } bool BoneMap::_get(const StringName &p_path, Variant &r_ret) const { @@ -47,7 +47,7 @@ bool BoneMap::_get(const StringName &p_path, Variant &r_ret) const { r_ret = get_skeleton_bone_name(which); return true; } - return true; + return false; } void BoneMap::_get_property_list(List<PropertyInfo> *p_list) const { diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index 46c1327e2b..b122189558 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -1712,7 +1712,7 @@ bool ArrayMesh::_get(const StringName &p_name, Variant &r_ret) const { return true; } - return true; + return false; } void ArrayMesh::reset_state() { diff --git a/scene/resources/skeleton_modification_stack_2d.cpp b/scene/resources/skeleton_modification_stack_2d.cpp index 71ddbc0898..5703185374 100644 --- a/scene/resources/skeleton_modification_stack_2d.cpp +++ b/scene/resources/skeleton_modification_stack_2d.cpp @@ -49,7 +49,7 @@ bool SkeletonModificationStack2D::_set(const StringName &p_path, const Variant & set_modification(mod_idx, p_value); return true; } - return true; + return false; } bool SkeletonModificationStack2D::_get(const StringName &p_path, Variant &r_ret) const { @@ -60,7 +60,7 @@ bool SkeletonModificationStack2D::_get(const StringName &p_path, Variant &r_ret) r_ret = get_modification(mod_idx); return true; } - return true; + return false; } void SkeletonModificationStack2D::setup() { |