[Bf-blender-cvs] [41fb4bedb81] refactor-mesh-hide-generic: Skip legacy conversion when reading and writing undo steps

Hans Goudey noreply at git.blender.org
Tue Aug 2 18:57:08 CEST 2022


Commit: 41fb4bedb81603956d8a8f1b61614fd6f920a71a
Author: Hans Goudey
Date:   Tue Aug 2 11:57:00 2022 -0500
Branches: refactor-mesh-hide-generic
https://developer.blender.org/rB41fb4bedb81603956d8a8f1b61614fd6f920a71a

Skip legacy conversion when reading and writing undo steps

===================================================================

M	source/blender/blenkernel/intern/mesh.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index bc9f29572bd..74b8f811e30 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -251,7 +251,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_convert_hide_layers_to_flags(mesh);
+  if (!BLO_write_is_undo(writer)) {
+    BKE_mesh_legacy_convert_hide_layers_to_flags(mesh);
+  }
 
   BLO_write_id_struct(writer, Mesh, id_address, &mesh->id);
   BKE_id_blend_write(writer, &mesh->id);
@@ -329,7 +331,9 @@ static void mesh_blend_read_data(BlendDataReader *reader, ID *id)
     }
   }
 
-  BKE_mesh_legacy_convert_flags_to_hide_layers(mesh);
+  if (!BLO_read_data_is_undo(reader)) {
+    BKE_mesh_legacy_convert_flags_to_hide_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