Revision: 41699
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41699
Author: ender79
Date: 2011-11-09 14:39:49 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
Fix a particle memory allocation mismatch using MEM_allocN for alloc and
BLI_cellalloc_free for free
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
2011-11-09 14:13:17 UTC (rev 41698)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
2011-11-09 14:39:49 UTC (rev 41699)
@@ -67,6 +67,7 @@
#include "BLI_utildefines.h"
#include "BLI_linklist.h"
#include "BLI_edgehash.h"
+#include "BLI_cellalloc.h"
#include "BKE_main.h"
#include "BKE_animsys.h"
@@ -3483,7 +3484,7 @@
if(dvert) {
if(!dvert->totweight) {
- dvert->dw = MEM_callocN
(sizeof(MDeformWeight), "deformWeight");
+ dvert->dw =
BLI_cellalloc_calloc(sizeof(MDeformWeight), "deformWeight");
dvert->totweight = 1;
}
@@ -3504,7 +3505,7 @@
if(dvert) {
if(!dvert->totweight) {
- dvert->dw = MEM_callocN
(sizeof(MDeformWeight), "deformWeight");
+ dvert->dw =
BLI_cellalloc_calloc(sizeof(MDeformWeight), "deformWeight");
dvert->totweight = 1;
}
/* roots should be 1.0, the rest can be
anything from 0.0 to 1.0 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs