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

Merge pull request #51290 from V-Sekai/less-reset-spam

Browse Source 
Animation RESET spam less patch 2
This commit is contained in:
Rémi Verschelde 2021-08-06 08:50:36 +02:00 committed by GitHub
commit 9c84233bfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/import/editor_importer_bake_reset.cpp
View File

@ -30,6 +30,7 @@
#include "editor/import/editor_importer_bake_reset.h" #include "editor/import/editor_importer_bake_reset.h"
#include "core/error/error_list.h"
#include "core/error/error_macros.h" #include "core/error/error_macros.h"
#include "core/math/transform_3d.h" #include "core/math/transform_3d.h"
#include "editor/import/scene_importer_mesh_node_3d.h" #include "editor/import/scene_importer_mesh_node_3d.h"
@ -158,8 +159,13 @@ void BakeReset::_fetch_reset_animation(AnimationPlayer *p_ap, Map<StringName, Ba
p_ap->get_animation_list(&anim_names); p_ap->get_animation_list(&anim_names);
Node *root = p_ap->get_owner(); Node *root = p_ap->get_owner();
ERR_FAIL_NULL(root); ERR_FAIL_NULL(root);
if (!p_ap->has_animation(p_bake_anim)) {
return;
}
Ref<Animation> a = p_ap->get_animation(p_bake_anim); Ref<Animation> a = p_ap->get_animation(p_bake_anim);
ERR_FAIL_NULL(a); if (a.is_null()) {
return;
}
for (int32_t track = 0; track < a->get_track_count(); track++) { for (int32_t track = 0; track < a->get_track_count(); track++) {
NodePath path = a->track_get_path(track); NodePath path = a->track_get_path(track);
String string_path = path; String string_path = path;
@ -173,7 +179,10 @@ void BakeReset::_fetch_reset_animation(AnimationPlayer *p_ap, Map<StringName, Ba
Quaternion rot; Quaternion rot;
Vector3 scale; Vector3 scale;
Error err = a->transform_track_get_key(track, key_i, &loc, &rot, &scale); Error err = a->transform_track_get_key(track, key_i, &loc, &rot, &scale);
ERR_CONTINUE(err); if (err != OK) {
ERR_PRINT_ONCE("Reset animation baker can't get key.");
continue;
}
rot.normalize(); rot.normalize();
Basis rot_basis = Basis(rot, scale); Basis rot_basis = Basis(rot, scale);
BakeResetRestBone rest_bone; BakeResetRestBone rest_bone;