blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Core: Fix broken CustomData IO with Autosave files #106648

Merged
Joseph Eagar merged 5 commits from temp-autosave-bug into main 2023-04-07 02:02:31 +02:00
Conversation 0 Commits 5 Files Changed 2 +1 -17
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a5b8f4b5bc - Show all commits

2
source/blender/blenkernel/intern/mesh_legacy_convert.cc
View File

@ -1240,7 +1240,7 @@ void BKE_mesh_legacy_sharp_faces_from_flags(Mesh *mesh)
using namespace blender;
using namespace blender::bke;
MutableAttributeAccessor attributes = mesh->attributes_for_write();
if (attributes.contains("sharp_face")) {
if (attributes.contains("sharp_face") || !CustomData_get_layer(&mesh->pdata, CD_MPOLY)) {
return;
}
const Span<MPoly> polys(static_cast<const MPoly *>(CustomData_get_layer(&mesh->pdata, CD_MPOLY)),
Hans Goudey commented 2023-04-07 01:28:53 +02:00
Outdated
Review
Copy Link

Unnecessary white-space change here

Unnecessary white-space change here

16
source/blender/blenloader/intern/versioning_400.cc
View File

@ -34,22 +34,6 @@ using blender::OffsetIndices;
static void version_mesh_legacy_to_struct_of_array_format(Mesh &mesh)
{
/* Autosave files don't have CD_MPOLY layers.
*/
if (!CustomData_has_layer(&mesh.pdata, CD_MPOLY) && mesh.poly_offset_indices) {
MPoly *polys_legacy = static_cast<MPoly *>(
CustomData_add_layer(&mesh.pdata, CD_MPOLY, CD_CONSTRUCT, mesh.totpoly));
/* Getting a link error when using mesh.polys(),
* for now just read poly_offset_indices directly.
*/
for (int poly_i : IndexRange(mesh.totpoly)) {
polys_legacy[poly_i].loopstart = mesh.poly_offset_indices[poly_i];
polys_legacy[poly_i].totloop = mesh.poly_offset_indices[poly_i + 1] -
mesh.poly_offset_indices[poly_i];
}
}
BKE_mesh_legacy_convert_flags_to_selection_layers(&mesh);
BKE_mesh_legacy_convert_flags_to_hide_layers(&mesh);
BKE_mesh_legacy_convert_uvs_to_generic(&mesh);
Hans Goudey commented 2023-04-07 01:31:05 +02:00
Outdated
Review
Copy Link

It shouldn't be necessary to add this at runtime, since we don't use the polys at all. We're meant to be able to read the new (not legacy format) too already. Is this preventing another crash in some of the functions below?

It shouldn't be necessary to add this at runtime, since we don't use the polys at all. We're meant to be able to read the new (not legacy format) too already. Is this preventing another crash in some of the functions below?
Joseph Eagar commented 2023-04-07 01:39:49 +02:00
Outdated
Review
Copy Link

A fair number of the conversion functions are using MPolys (it crashes in the sharp face one).

A fair number of the conversion functions are using MPolys (it crashes in the sharp face one).