godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 19:41:11 +00:00
Code Releases Wiki Activity

FBX: Clarify outdated format error

Browse Source 
See #44780.
This commit is contained in:
Rémi Verschelde
2020-12-29 09:40:49 +01:00
parent edccc0bbdf
commit 1dd75f41e5
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/fbx/editor_scene_importer_fbx.cpp
View File

@@ -63,8 +63,7 @@ void EditorSceneImporterFBX::get_extensions(List<String> *r_extensions) const {
const String fbx_str = "fbx"; const String fbx_str = "fbx";
Vector<String> exts; Vector<String> exts;
exts.push_back(fbx_str); exts.push_back(fbx_str);
_register_project_setting_import(fbx_str, import_setting_string, exts, r_extensions, _register_project_setting_import(fbx_str, import_setting_string, exts, r_extensions, true);
true);
} }
void EditorSceneImporterFBX::_register_project_setting_import(const String generic, void EditorSceneImporterFBX::_register_project_setting_import(const String generic,
@@ -181,7 +180,7 @@ Node3D *EditorSceneImporterFBX::import_scene(const String &p_path, uint32_t p_fl
} }
if (is_blender_fbx) { if (is_blender_fbx) {
WARN_PRINT("Blender FBX files will not work properly with keyframes or skeletons until we make fixes stand by."); WARN_PRINT("Blender FBX files will not work properly with keyframes or skeletons until we make fixes. Please stand by.");
} }
Node3D *spatial = _generate_scene(p_path, &doc, p_flags, p_bake_fps, 8); Node3D *spatial = _generate_scene(p_path, &doc, p_flags, p_bake_fps, 8);
@@ -196,7 +195,7 @@ Node3D *EditorSceneImporterFBX::import_scene(const String &p_path, uint32_t p_fl
return spatial; return spatial;
} else { } else {
print_error("Cannot import file: " + p_path + " version of file is unsupported, please re-export in your modelling package file version is: " + itos(doc.FBXVersion())); ERR_PRINT(vformat("Cannot import FBX file: %s. It uses file format %d which is unsupported by Godot. Please re-export it or convert it to a newer format.", p_path, doc.FBXVersion()));
} }
} }
@@ -550,8 +549,8 @@ Node3D *EditorSceneImporterFBX::_generate_scene(
print_verbose("populating skeleton with bone: " + bone->bone_name); print_verbose("populating skeleton with bone: " + bone->bone_name);
// // populate bone skeleton - since fbx has no DOM for the skeleton just a node. //// populate bone skeleton - since fbx has no DOM for the skeleton just a node.
// bone->bone_skeleton = fbx_skeleton_inst; //bone->bone_skeleton = fbx_skeleton_inst;
// now populate bone on the armature node list // now populate bone on the armature node list
fbx_skeleton_inst->skeleton_bones.push_back(bone); fbx_skeleton_inst->skeleton_bones.push_back(bone);
@@ -688,8 +687,8 @@ Node3D *EditorSceneImporterFBX::_generate_scene(
// //
// Get Mesh Node Xform only // Get Mesh Node Xform only
// //
// ERR_CONTINUE_MSG(!state.fbx_target_map.has(mesh_id), "invalid xform for the skin pose: " + itos(mesh_id)); //ERR_CONTINUE_MSG(!state.fbx_target_map.has(mesh_id), "invalid xform for the skin pose: " + itos(mesh_id));
// Ref<FBXNode> mesh_node_xform_data = state.fbx_target_map[mesh_id]; //Ref<FBXNode> mesh_node_xform_data = state.fbx_target_map[mesh_id];
if (!mesh_skin) { if (!mesh_skin) {
continue; // not a deformer. continue; // not a deformer.