[Bf-blender-cvs] [54ed0bb] master: Fix bad handling of datablock's nodetree id_clear_lib_data_ex().

[Bastien Montagne]

Commit: 54ed0bb6538d5066d3e6ff2f3d14bfe6e26957ca
Author: Bastien Montagne
Date:   Thu Jul 14 15:23:53 2016 +0200
Branches: master
https://developer.blender.org/rB54ed0bb6538d5066d3e6ff2f3d14bfe6e26957ca

Fix bad handling of datablock's nodetree id_clear_lib_data_ex().

Those data blocks are never shared, exactly as with shapekeys, much simpler
to also clear their lib_data (especially since they have no user!).

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

M	source/blender/blenkernel/intern/library.c

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

diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index c239008..f570066 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1483,10 +1483,8 @@ void id_clear_lib_data_ex(Main *bmain, ID *id, bool id_in_mainlist)
 	/* internal bNodeTree blocks inside ID types below
 	 * also stores id->lib, make sure this stays in sync.
 	 */
-	ntree = ntreeFromID(id);
-
-	if (ntree) {
-		ntreeMakeLocal(bmain, ntree, false, false);
+	if ((ntree = ntreeFromID(id))) {
+		id_clear_lib_data_ex(bmain, &ntree->id, id_in_mainlist);
 	}
 
 	if (GS(id->name) == ID_OB) {