svn merge ^/trunk/blender -r42290:42292
authorCampbell Barton <ideasman42@gmail.com>
Wed, 30 Nov 2011 10:07:04 +0000 (10:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 30 Nov 2011 10:07:04 +0000 (10:07 +0000)
1  2 
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/dynamicpaint.c

index 6947bf05890e558b74d713890282b6b72e00b72e,1f09d98d697c359d92ed4641a5bcd6371c03095a..49ca4e139cc8770d14c8ad10aa34aef3d8170b00
@@@ -561,10 -558,10 +561,10 @@@ MDeformWeight *defvert_verify_index(MDe
        if (dw_new)
                return dw_new;
  
-       dw_new= BLI_cellalloc_calloc(sizeof(MDeformWeight)*(dv->totweight+1), "deformWeight");
 -      dw_new= MEM_callocN(sizeof(MDeformWeight)*(dvert->totweight+1), "deformWeight");
++      dw_new= BLI_cellalloc_calloc(sizeof(MDeformWeight)*(dvert->totweight+1), "deformWeight");
        if (dvert->dw) {
                memcpy(dw_new, dvert->dw, sizeof(MDeformWeight)*dvert->totweight);
 -              MEM_freeN(dvert->dw);
 +              BLI_cellalloc_free(dvert->dw);
        }
        dvert->dw= dw_new;
        dw_new += dvert->totweight;