[Bf-blender-cvs] [bc43854] asset-engine: Merge branch 'asset-experiments' into asset-engine

[Bastien Montagne]

Commit: bc4385465137c33bcef07f92276f7393329f4fdd
Author: Bastien Montagne
Date:   Fri Jun 12 10:43:14 2015 +0200
Branches: asset-engine
https://developer.blender.org/rBbc4385465137c33bcef07f92276f7393329f4fdd

Merge branch 'asset-experiments' into asset-engine

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



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

diff --cc source/blender/blenkernel/intern/library.c
index 8d16cf6,39bcf51..bf09178
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -1421,8 -1420,16 +1421,17 @@@ void id_clear_lib_data(Main *bmain, ID 
  
  	if (ntree) {
  		ntree->id.lib = NULL;
 +		MEM_SAFE_FREE(ntree->id.uuid);
  	}
+ 
+ 	if (GS(id->name) == ID_OB) {
+ 		Object *object = (Object*)id;
+ 		if (object->proxy_from != NULL) {
+ 			object->proxy_from->proxy = NULL;
+ 			object->proxy_from->proxy_group = NULL;
+ 		}
+ 		object->proxy = object->proxy_from = object->proxy_group = NULL;
+ 	}
  }
  
  /* next to indirect usage in read/writefile also in editobject.c scene.c */