[Bf-blender-cvs] [033a899] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 033a89957c60fe27791b02b4203225bb1aaabb3d
Author: Bastien Montagne
Date:   Tue Nov 10 12:45:42 2015 +0100
Branches: id-remap
https://developer.blender.org/rB033a89957c60fe27791b02b4203225bb1aaabb3d

Merge branch 'master' into id-remap

Conflicts:
	source/blender/blenkernel/intern/curve.c
	source/blender/blenkernel/intern/linestyle.c
	source/blender/blenkernel/intern/material.c
	source/blender/blenkernel/intern/mball.c
	source/blender/blenkernel/intern/mesh.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenkernel/intern/scene.c
	source/blender/blenkernel/intern/world.c

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/brush.c
index f1a729d,92ab4d7..225842e
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@@ -133,10 -133,10 +133,10 @@@ static void brush_defaults(Brush *brush
  
  void BKE_brush_init(Brush *brush)
  {
 -	BLI_assert(MEMCMP_STRUCT_OFS_IS_ZERO(brush, id));
 +	BLI_assert(MEMCMP_NULL_STRUCT_OFS(brush, id));
  
  	/* enable fake user by default */
- 	brush->id.flag |= LIB_FAKEUSER;
+ 	id_fake_user_set(&brush->id);
  
  	brush_defaults(brush);
  
diff --cc source/blender/makesrna/intern/rna_ID.c
index fdd957c,e1e892a..13feddf
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@@ -329,17 -327,10 +327,17 @@@ static void rna_ID_update_tag(ID *id, R
  
  static void rna_ID_user_clear(ID *id)
  {
+ 	id_fake_user_clear(id);
  	id->us = 0; /* don't save */
- 	id->flag &= ~LIB_FAKEUSER;
  }
  
 +static void rna_ID_user_remap(ID *id, Main *bmain, ID *new_id)
 +{
 +	if (GS(id->name) == GS(new_id->name)) {
 +		BKE_libblock_remap(bmain, id, new_id, true);  /* Now, do not allow remapping data in linked data from here... */
 +	}
 +}
 +
  static AnimData * rna_ID_animation_data_create(ID *id, Main *bmain)
  {
  	AnimData *adt = BKE_animdata_add_id(id);