diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2020-12-23 18:23:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 18:23:34 +0100 |
| commit | 1e08647195a690d14666443b7691d8406a7e73b7 (patch) | |
| tree | 391421e38b142890353d75b8dae438da68541f94 /modules/fbx/data/fbx_mesh_data.cpp | |
| parent | 719e4b115693aa51f53e64ae6ac66ee42741a89c (diff) | |
| parent | 58a00b4f3c36a7caab387c2cc2548ccfb6c4be6c (diff) | |
Merge pull request #44621 from fire/update-fbx
Update FBX because of changes in the core api.
Diffstat (limited to 'modules/fbx/data/fbx_mesh_data.cpp')
| -rw-r--r-- | modules/fbx/data/fbx_mesh_data.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/fbx/data/fbx_mesh_data.cpp b/modules/fbx/data/fbx_mesh_data.cpp index 3dc84bd1f4..0728866adb 100644 --- a/modules/fbx/data/fbx_mesh_data.cpp +++ b/modules/fbx/data/fbx_mesh_data.cpp @@ -115,7 +115,7 @@ struct SurfaceData { Array morphs; }; -EditorSceneImporterMeshNode *FBXMeshData::create_fbx_mesh(const ImportState &state, const FBXDocParser::MeshGeometry *p_mesh_geometry, const FBXDocParser::Model *model, bool use_compression) { +EditorSceneImporterMeshNode3D *FBXMeshData::create_fbx_mesh(const ImportState &state, const FBXDocParser::MeshGeometry *p_mesh_geometry, const FBXDocParser::Model *model, bool use_compression) { mesh_geometry = p_mesh_geometry; // todo: make this just use a uint64_t FBX ID this is a copy of our original materials unfortunately. const std::vector<const FBXDocParser::Material *> &material_lookup = model->GetMaterials(); @@ -410,7 +410,7 @@ EditorSceneImporterMeshNode *FBXMeshData::create_fbx_mesh(const ImportState &sta in_mesh_surface_id += 1; } - EditorSceneImporterMeshNode *godot_mesh = memnew(EditorSceneImporterMeshNode); + EditorSceneImporterMeshNode3D *godot_mesh = memnew(EditorSceneImporterMeshNode3D); godot_mesh->set_mesh(mesh); return godot_mesh; } |