remove cellalloc, from my tests jemalloc beats cellalloc, so we better just use a...

[blender.git] / source / blender / bmesh / intern / bmesh_mesh.c

diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index 1f0fc544590f78cde82e0fe3f712cba59bc248be..fe1a5ac9455ca365c571db18dff902f03ec038ae 100644 (file)
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -36,7 +36,6 @@
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"

-#include "BLI_cellalloc.h"

 
 #include "BKE_utildefines.h"
 #include "BKE_cdderivedmesh.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_cdderivedmesh.h"


@@ -399,9 +398,9 @@ static void bmesh_set_mdisps_space(BMesh *bm, int from, int to)
                                        memcpy(lmd->disps, mdisps->disps, sizeof(float)*3*lmd->totdisp);
                                } else if (mdisps->disps) {
                                        if (lmd->disps)
                                        memcpy(lmd->disps, mdisps->disps, sizeof(float)*3*lmd->totdisp);
                                } else if (mdisps->disps) {
                                        if (lmd->disps)

-                                               BLI_cellalloc_free(lmd->disps);
+                                               MEM_freeN(lmd->disps);

                                        
                                        

-                                       lmd->disps = BLI_cellalloc_dupalloc(mdisps->disps);
+                                       lmd->disps = MEM_dupallocN(mdisps->disps);

                                        lmd->totdisp = mdisps->totdisp;
                                }
                                
                                        lmd->totdisp = mdisps->totdisp;
                                }