[Bf-blender-cvs] [959e2e8] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 959e2e8cfe0151610769cef3d648e40bcf113a29
Author: Bastien Montagne
Date:   Tue Nov 10 14:51:42 2015 +0100
Branches: id-remap
https://developer.blender.org/rB959e2e8cfe0151610769cef3d648e40bcf113a29

Merge branch 'master' into id-remap

Conflicts:
	source/blender/blenkernel/intern/library.c

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



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

diff --cc source/blender/blenkernel/intern/library.c
index 1a997a3,b76323b..f7a06ca
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -1507,14 -1214,14 +1507,10 @@@ void BKE_libblock_free_us(Main *bmain, 
  {
  	ID *id = idv;
  	
- 	id->us--;
+ 	id_us_min(id);
  
- 	if (id->us < 0) {
- 		printf("ERROR block %s (from %s lib): %d users\n", id->name, id->lib ?  id->lib->name : "<MAIN>", id->us);
- 		id->us = 0;
- 	}
  	if (id->us == 0) {
 -		switch (GS(id->name)) {
 -			case ID_OB:
 -				BKE_object_unlink(bmain, (Object *)id);
 -				break;
 -		}
 +		BKE_libblock_unlink(bmain, id);
  		
  		BKE_libblock_free(bmain, id);
  	}