[Bf-blender-cvs] [01bb6863922] refactor-mesh-bevel-weight-generic: Skip legacy conversion in undo reading and writing
Hans Goudey
noreply at git.blender.org
Tue Aug 2 18:47:22 CEST 2022
Commit: 01bb68639229b765fbc633feba166bc4b8d351e0
Author: Hans Goudey
Date: Tue Aug 2 11:47:00 2022 -0500
Branches: refactor-mesh-bevel-weight-generic
https://developer.blender.org/rB01bb68639229b765fbc633feba166bc4b8d351e0
Skip legacy conversion in undo reading and writing
===================================================================
M source/blender/blenkernel/intern/mesh.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index b777642368c..5775d29479e 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -252,7 +252,9 @@ static void mesh_blend_write(BlendWriter *writer, ID *id, const void *id_address
CustomData_blend_write_prepare(mesh->pdata, poly_layers);
}
- BKE_mesh_legacy_bevel_weight_from_layers(mesh);
+ if (!BLO_write_is_undo(writer)) {
+ BKE_mesh_legacy_bevel_weight_from_layers(mesh);
+ }
BLO_write_id_struct(writer, Mesh, id_address, &mesh->id);
BKE_id_blend_write(writer, &mesh->id);
@@ -330,7 +332,9 @@ static void mesh_blend_read_data(BlendDataReader *reader, ID *id)
}
}
- BKE_mesh_legacy_bevel_weight_to_layers(mesh);
+ if (!BLO_read_data_is_undo(reader)) {
+ BKE_mesh_legacy_bevel_weight_to_layers(mesh);
+ }
/* We don't expect to load normals from files, since they are derived data. */
BKE_mesh_normals_tag_dirty(mesh);
More information about the Bf-blender-cvs
mailing list