diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-08 13:22:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 13:22:20 +0200 |
| commit | 581dcadf4005a25d162d0c5201a9dfab35989c2a (patch) | |
| tree | 2283c2168974f2a63b914eefb5c25d543982c6d4 /modules/assimp/editor_scene_importer_assimp.cpp | |
| parent | f6430eec2c39382870a433a1267df5fa695e40a9 (diff) | |
| parent | 365c35f30ea3b4749c8a0ca07db8464f9b6bc41c (diff) | |
Merge pull request #39370 from Anutrix/remove-usused-assimp-var
Removed variables in EditorSceneImporterAssimp::import_scene that became unused.
Diffstat (limited to 'modules/assimp/editor_scene_importer_assimp.cpp')
| -rw-r--r-- | modules/assimp/editor_scene_importer_assimp.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp index abbd08ae4e..aedc4b690a 100644 --- a/modules/assimp/editor_scene_importer_assimp.cpp +++ b/modules/assimp/editor_scene_importer_assimp.cpp @@ -44,7 +44,6 @@ #include <assimp/scene.h> #include <assimp/Importer.hpp> #include <assimp/LogStream.hpp> -#include <string> // move into assimp aiBone *get_bone_by_name(const aiScene *scene, aiString bone_name) { @@ -102,8 +101,6 @@ void EditorSceneImporterAssimp::_bind_methods() { Node *EditorSceneImporterAssimp::import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List<String> *r_missing_deps, Error *r_err) { Assimp::Importer importer; - std::wstring w_path = ProjectSettings::get_singleton()->globalize_path(p_path).c_str(); - std::string s_path(w_path.begin(), w_path.end()); importer.SetPropertyBool(AI_CONFIG_PP_FD_REMOVE, true); // Cannot remove pivot points because the static mesh will be in the wrong place importer.SetPropertyBool(AI_CONFIG_IMPORT_FBX_PRESERVE_PIVOTS, false); |