godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85461 from akien-mga/AnimationMixer-validate-object-before-blend 

AnimationMixer: Validate ObjectID before blend in case the object was freed
This commit is contained in:
Rémi Verschelde 2023-11-28 13:37:06 +01:00
parent f82bf35a03 a363269479
commit 83ae2b158f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/animation/animation_mixer.cpp
View File

@ -1708,7 +1708,12 @@ void AnimationMixer::_blend_apply() {
}
}
}
t->object->set_indexed(t->subpath, Animation::cast_from_blendwise(t->value, t->init_value.get_type()));
// t->object isn't safe here, get instance from id (GH-85365).
Object *obj = ObjectDB::get_instance(t->object_id);
if (obj) {
obj->set_indexed(t->subpath, Animation::cast_from_blendwise(t->value, t->init_value.get_type()));
}
} break;
case Animation::TYPE_BEZIER: {