From 56da70f2e880d04e14c20b7ad32b85c5d74c3020 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 7 Jun 2020 22:56:26 +0530 Subject: [PATCH] Removed variables and #include in EditorSceneImporterAssimp::import_scene that became unused after the recent commit ec1bf96(#39363). (cherry picked from commit 365c35f30ea3b4749c8a0ca07db8464f9b6bc41c) --- modules/assimp/editor_scene_importer_assimp.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp index 5f003b49181..44df268602e 100644 --- a/modules/assimp/editor_scene_importer_assimp.cpp +++ b/modules/assimp/editor_scene_importer_assimp.cpp @@ -44,7 +44,6 @@ #include #include #include -#include // move into assimp aiBone *get_bone_by_name(const aiScene *scene, aiString bone_name) { @@ -104,8 +103,6 @@ void EditorSceneImporterAssimp::_bind_methods() { Node *EditorSceneImporterAssimp::import_scene(const String &p_path, uint32_t p_flags, int p_bake_fps, List *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);