diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-04-13 22:47:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-13 22:47:54 +0200 |
commit | 970debed93fd172776914b9482e2c110e01a1ac1 (patch) | |
tree | 0ef1e35464549a6932b6cb7f65376cbc81a7148d /editor/editor_node.cpp | |
parent | 8ada85ef1d7ddfa30871f002812efaec65f4a170 (diff) | |
parent | 66009318e0827f01a584aca14c6e9ec0079354d3 (diff) |
Merge pull request #60177 from reduz/animation-library-import
Import scenes as AnimationLibrary
Diffstat (limited to 'editor/editor_node.cpp')
-rw-r--r-- | editor/editor_node.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 99e30593a9..6fe6309eed 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -5997,18 +5997,22 @@ EditorNode::EditorNode() { import_scene.instantiate(); ResourceFormatImporter::get_singleton()->add_importer(import_scene); + Ref<ResourceImporterScene> import_animation; + import_animation = Ref<ResourceImporterScene>(memnew(ResourceImporterScene(true))); + ResourceFormatImporter::get_singleton()->add_importer(import_animation); + { Ref<EditorSceneFormatImporterCollada> import_collada; import_collada.instantiate(); - import_scene->add_importer(import_collada); + ResourceImporterScene::add_importer(import_collada); Ref<EditorOBJImporter> import_obj2; import_obj2.instantiate(); - import_scene->add_importer(import_obj2); + ResourceImporterScene::add_importer(import_obj2); Ref<EditorSceneFormatImporterESCN> import_escn; import_escn.instantiate(); - import_scene->add_importer(import_escn); + ResourceImporterScene::add_importer(import_escn); } Ref<ResourceImporterBitMap> import_bitmap; @@ -7245,6 +7249,7 @@ EditorNode::EditorNode() { EditorNode::~EditorNode() { EditorInspector::cleanup_plugins(); EditorTranslationParser::get_singleton()->clean_parsers(); + ResourceImporterScene::clean_up_importer_plugins(); remove_print_handler(&print_handler); EditorHelp::cleanup_doc(); |