svn merge -r41310:41329 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Oct 2011 05:17:09 +0000 (05:17 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Oct 2011 05:17:09 +0000 (05:17 +0000)
1  2 
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/library.c
source/blender/editors/curve/editfont.c
source/blender/editors/metaball/mball_edit.c
source/blender/editors/object/object_lattice.c
source/blender/editors/object/object_relations.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_image.c

index 037e63f1d235e60f8112a23bc47fa71bed4c08b9,a96100237759d8f9fb20b8ce849d6d5958fd7ec5..429848f3dcb4637b48ed3da3e8cc73eee8c63658
  #include "BKE_deform.h"
  
  #include "BLI_blenlib.h"
+ #include "BLI_utildefines.h"
 +#include "BLI_cellalloc.h"
 +
 +
  void defgroup_copy_list (ListBase *outbase, ListBase *inbase)
  {
        bDeformGroup *defgroup, *defgroupn;