diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-23 19:32:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 19:32:44 +0200 |
| commit | c25fa02c1c242df0f256dd58af650f8c8806c066 (patch) | |
| tree | 8e2c5d48ff596a8c8ac43a0cc311fec8c8b12dea /editor | |
| parent | e0d48f87f9cd3ab9685a55145215e8de45f905a8 (diff) | |
| parent | 7f83977f37f5f13024bee4f29ead87a992a072b6 (diff) | |
Merge pull request #50765 from Calinou/resource-importer-expose-order-enum
Expose an ImportOrder enum in ResourceImporter
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/import/resource_importer_scene.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/import/resource_importer_scene.h b/editor/import/resource_importer_scene.h index c6e5836a23..781beff689 100644 --- a/editor/import/resource_importer_scene.h +++ b/editor/import/resource_importer_scene.h @@ -155,7 +155,8 @@ public: virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const override; virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const override; - virtual int get_import_order() const override { return 100; } //after everything + // Import scenes *after* everything else (such as textures). + virtual int get_import_order() const override { return ResourceImporter::IMPORT_ORDER_SCENE; } Node *_pre_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, List<Ref<Shape3D>>> &collision_map); Node *_post_fix_node(Node *p_node, Node *p_root, Map<Ref<EditorSceneImporterMesh>, List<Ref<Shape3D>>> &collision_map, Set<Ref<EditorSceneImporterMesh>> &r_scanned_meshes, const Dictionary &p_node_data, const Dictionary &p_material_data, const Dictionary &p_animation_data, float p_animation_fps); |