|
|
@@ -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);
|
unknown