diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-05 20:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-05 20:44:42 +0100 |
| commit | 3662105f8bd8c897caf625e44195bdfc7bdaf0f9 (patch) | |
| tree | 44d15401f31b9afeff8493758c1cfe50fb421345 /modules/gltf | |
| parent | 8f6cba3a44aa9daa8a2694abf2d2647b03b60dc8 (diff) | |
| parent | 07a39684a046aa3a1179b7a37d8262fef19d53d2 (diff) | |
Merge pull request #56479 from V-Sekai/import-options
Diffstat (limited to 'modules/gltf')
| -rw-r--r-- | modules/gltf/editor_scene_importer_gltf.cpp | 4 | ||||
| -rw-r--r-- | modules/gltf/editor_scene_importer_gltf.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/gltf/editor_scene_importer_gltf.cpp b/modules/gltf/editor_scene_importer_gltf.cpp index b4d39041da..f063cc1e2b 100644 --- a/modules/gltf/editor_scene_importer_gltf.cpp +++ b/modules/gltf/editor_scene_importer_gltf.cpp @@ -48,7 +48,7 @@ void EditorSceneFormatImporterGLTF::get_extensions(List<String> *r_extensions) c } Node *EditorSceneFormatImporterGLTF::import_scene(const String &p_path, - uint32_t p_flags, int p_bake_fps, + uint32_t p_flags, const Map<StringName, Variant> &p_options, int p_bake_fps, List<String> *r_missing_deps, Error *r_err) { Ref<GLTFDocument> doc; @@ -65,7 +65,7 @@ Node *EditorSceneFormatImporterGLTF::import_scene(const String &p_path, } Ref<Animation> EditorSceneFormatImporterGLTF::import_animation(const String &p_path, - uint32_t p_flags, + uint32_t p_flags, const Map<StringName, Variant> &p_options, int p_bake_fps) { return Ref<Animation>(); } diff --git a/modules/gltf/editor_scene_importer_gltf.h b/modules/gltf/editor_scene_importer_gltf.h index dafd278f24..4410559b3d 100644 --- a/modules/gltf/editor_scene_importer_gltf.h +++ b/modules/gltf/editor_scene_importer_gltf.h @@ -47,9 +47,9 @@ class EditorSceneFormatImporterGLTF : public EditorSceneFormatImporter { public: virtual uint32_t get_import_flags() const override; virtual void get_extensions(List<String> *r_extensions) const override; - virtual Node *import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err = nullptr) override; + virtual Node *import_scene(const String &p_path, uint32_t p_flags, const Map<StringName, Variant> &p_options, int p_bake_fps, List<String> *r_missing_deps, Error *r_err = nullptr) override; virtual Ref<Animation> import_animation(const String &p_path, - uint32_t p_flags, int p_bake_fps) override; + uint32_t p_flags, const Map<StringName, Variant> &p_options, int p_bake_fps) override; }; #endif // TOOLS_ENABLED #endif // EDITOR_SCENE_IMPORTER_GLTF_H |