Merge branch 'master' into free-refcount-ids
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 12 Oct 2015 18:31:39 +0000 (20:31 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 12 Oct 2015 18:31:39 +0000 (20:31 +0200)
1  2 
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c

Simple merge
Simple merge
index ee93750ce538499fd16eb54e642144e45da48567,e5f826f670d44beddbcc4ca25d0f538701574f7b..4ef30c06fe5ccf19675acdb1fbadc3587d1a1285
@@@ -478,7 -462,12 +478,7 @@@ void BKE_object_free(Object *ob, const 
        BKE_previewimg_free(&ob->preview);
  }
  
- static void unlink_object__unlinkModifierLinks(void *userData, Object *ob, Object **obpoin)
 -void BKE_object_free(Object *ob)
 -{
 -      BKE_object_free_ex(ob, true);
 -}
 -
+ static void unlink_object__unlinkModifierLinks(void *userData, Object *ob, Object **obpoin, int UNUSED(cd_flag))
  {
        Object *unlinkOb = userData;