[Bf-blender-cvs] [40f0783d518] master: Cleanup: remove BKE_mesh_free_data use for lineart mesh copies

Campbell Barton noreply at git.blender.org
Fri Aug 20 08:23:08 CEST 2021


Commit: 40f0783d518a62c07f77394de12fb17a53024170
Author: Campbell Barton
Date:   Fri Aug 20 16:08:35 2021 +1000
Branches: master
https://developer.blender.org/rB40f0783d518a62c07f77394de12fb17a53024170

Cleanup: remove BKE_mesh_free_data use for lineart mesh copies

Even though this didn't leak memory, BKE_mesh_free_data doesn't
handle freeing data that is part of the ID making it error prone.

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

M	source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c

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

diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 564a3c526f4..99e3d59a57f 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -41,6 +41,7 @@
 #include "BKE_gpencil.h"
 #include "BKE_gpencil_geom.h"
 #include "BKE_gpencil_modifier.h"
+#include "BKE_lib_id.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
@@ -1691,8 +1692,7 @@ static void lineart_geometry_object_load(LineartObjectInfo *obi, LineartRenderBu
   }
 
   if (obi->free_use_mesh) {
-    BKE_mesh_free_data(obi->original_me);
-    MEM_freeN(obi->original_me);
+    BKE_id_free(NULL, &obi->original_me);
   }
 
   if (rb->remove_doubles) {



More information about the Bf-blender-cvs mailing list