Merge pull request #85461 from akien-mga/AnimationMixer-validate-obje…

…ct-before-blend AnimationMixer: Validate ObjectID before blend in case the object was freed
migueldeicaza · Nov 28, 2023 · 83ae2b1 · 83ae2b1
2 parents f82bf35 + a363269
commit 83ae2b1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/scene/animation/animation_mixer.cpp b/scene/animation/animation_mixer.cpp
@@ -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: {