Forráskód Böngészése

Merge pull request #84405 from KoBeWi/no_escaping_the_RESET

Fix RESET not effective when saving inactive scene
Yuri Sizov 1 éve
szülő
commit
dfcbc1d758
1 módosított fájl, 2 hozzáadás és 1 törlés
  1. 2 1
      scene/animation/animation_mixer.cpp

+ 2 - 1
scene/animation/animation_mixer.cpp

@@ -1998,10 +1998,11 @@ void AnimationMixer::reset() {
 	ERR_FAIL_NULL(root_node_object);
 
 	AnimationPlayer *aux_player = memnew(AnimationPlayer);
-	EditorNode::get_singleton()->add_child(aux_player);
+	root_node_object->add_child(aux_player);
 	Ref<AnimationLibrary> al;
 	al.instantiate();
 	al->add_animation(SceneStringNames::get_singleton()->RESET, reset_anim);
+	aux_player->set_reset_on_save_enabled(false);
 	aux_player->set_root_node(aux_player->get_path_to(root_node_object));
 	aux_player->add_animation_library("", al);
 	aux_player->set_assigned_animation(SceneStringNames::get_singleton()->RESET);