mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #88557 from akien-mga/fix-animation-mixer-resolving-tracks

Browse Source 
Fix AnimationMixer breaking animations with redundant check
This commit is contained in:
Rémi Verschelde 2024-02-19 17:06:57 +01:00
commit fb10e67fef
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/animation/animation_mixer.cpp
View File

@ -661,13 +661,6 @@ bool AnimationMixer::_update_caches() {
Ref<Resource> resource;
Vector<StringName> leftover_path;
if (!parent->has_node_and_resource(path)) {
if (check_path) {
WARN_PRINT_ED(mixer_name + ": '" + String(E) + "', couldn't resolve track: '" + String(path) + "'. This warning can be disabled in Project Settings.");
}
continue;
}
Node *child = parent->get_node_and_resource(path, resource, leftover_path);
if (!child) {
if (check_path) {

2
scene/main/node.cpp
View File

@ -3025,9 +3025,9 @@ Array Node::_get_node_and_resource(const NodePath &p_path) {
Node *Node::get_node_and_resource(const NodePath &p_path, Ref<Resource> &r_res, Vector<StringName> &r_leftover_subpath, bool p_last_is_property) const {
ERR_THREAD_GUARD_V(nullptr);
Node *node = get_node(p_path);
r_res = Ref<Resource>();
r_leftover_subpath = Vector<StringName>();
Node *node = get_node_or_null(p_path);
if (!node) {
return nullptr;
}