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

Fix #20467. The "Anim imported" warning gets displayed properly when working on imported anims. 

(cherry picked from commit 95cd74fc4b)
This commit is contained in:
Sl3dge78 2020-06-18 23:12:22 +02:00 committed by Rémi Verschelde
parent d080c0de51
commit d99f6c4d5c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/import/editor_scene_importer_gltf.cpp
View File

@ -2910,6 +2910,7 @@ void EditorSceneImporterGLTF::_import_animation(GLTFState &state, AnimationPlaye
int track_idx = animation->get_track_count(); int track_idx = animation->get_track_count();
animation->add_track(Animation::TYPE_TRANSFORM); animation->add_track(Animation::TYPE_TRANSFORM);
animation->track_set_path(track_idx, node_path); animation->track_set_path(track_idx, node_path);
animation->track_set_imported(track_idx, true);
//first determine animation length //first determine animation length
const float increment = 1.0 / float(bake_fps); const float increment = 1.0 / float(bake_fps);

4
editor/import/resource_importer_scene.cpp
View File

@ -974,9 +974,9 @@ void ResourceImporterScene::_make_external_resources(Node *p_node, const String
if (!p_animations.has(anim)) { if (!p_animations.has(anim)) {
//mark what comes from the file first, this helps eventually keep user data // We are making external files so they are modifiable
for (int i = 0; i < anim->get_track_count(); i++) { for (int i = 0; i < anim->get_track_count(); i++) {
anim->track_set_imported(i, true); anim->track_set_imported(i, false);
} }
String ext_name; String ext_name;