[Bf-blender-cvs] [05f93b58d3f] master: Fix: Crash when writing mesh after previous commit

Hans Goudey noreply at git.blender.org
Fri Nov 18 23:41:56 CET 2022


Commit: 05f93b58d3f902c2081826b7c0355969e9041bcc
Author: Hans Goudey
Date:   Fri Nov 18 16:24:15 2022 -0600
Branches: master
https://developer.blender.org/rB05f93b58d3f902c2081826b7c0355969e9041bcc

Fix: Crash when writing mesh after previous commit

Runtime data was accessed after it was explicitly set to null.

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

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

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

diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index 924b5600a16..f2f9e4a4c5f 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -228,7 +228,6 @@ static void mesh_blend_write(BlendWriter *writer, ID *id, const void *id_address
   mesh->mface = nullptr;
   mesh->totface = 0;
   memset(&mesh->fdata, 0, sizeof(mesh->fdata));
-  mesh->runtime = nullptr;
 
   /* Do not store actual geometry data in case this is a library override ID. */
   if (ID_IS_OVERRIDE_LIBRARY(mesh) && !is_undo) {
@@ -277,6 +276,8 @@ static void mesh_blend_write(BlendWriter *writer, ID *id, const void *id_address
     CustomData_blend_write_prepare(mesh->pdata, poly_layers, names_to_skip);
   }
 
+  mesh->runtime = nullptr;
+
   BLO_write_id_struct(writer, Mesh, id_address, &mesh->id);
   BKE_id_blend_write(writer, &mesh->id);



More information about the Bf-blender-cvs mailing list