Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #101450 from TokageItLab/reset-anim-skeleton

Browse source 
Change reset timing of the AnimationMixer and Skeleton on save
This commit is contained in:
Rémi Verschelde 2025-01-12 18:07:32 +01:00
commit bb8001c83a
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
editor/editor_node.cpp
View file

@ -1910,11 +1910,12 @@ void EditorNode::_save_scene(String p_file, int idx) {
return;
}
List<Pair<AnimationMixer *, Ref<AnimatedValuesBackup>>> anim_backups;
_reset_animation_mixers(scene, &anim_backups);
scene->propagate_notification(NOTIFICATION_EDITOR_PRE_SAVE);
editor_data.apply_changes_in_editors();
List<Pair<AnimationMixer *, Ref<AnimatedValuesBackup>>> anim_backups;
_reset_animation_mixers(scene, &anim_backups);
save_default_environment();
_save_editor_states(p_file, idx);

6
scene/3d/skeleton_3d.cpp
View file

@ -325,6 +325,12 @@ void Skeleton3D::_notification(int p_what) {
update_flags = UPDATE_FLAG_POSE;
_notification(NOTIFICATION_UPDATE_SKELETON);
} break;
#ifdef TOOLS_ENABLED
case NOTIFICATION_EDITOR_PRE_SAVE: {
force_update_all_dirty_bones();
emit_signal(SceneStringName(skeleton_updated));
} break;
#endif // TOOLS_ENABLED
case NOTIFICATION_UPDATE_SKELETON: {
// Update bone transforms to apply unprocessed poses.
force_update_all_dirty_bones();