[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57994] trunk/blender/source/blender/ blenkernel/intern/library.c: Fix #36006: appending some datablock types (e. g.

[Brecht Van Lommel]

Revision: 57994
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57994
Author:   blendix
Date:     2013-07-04 13:03:08 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Fix #36006: appending some datablock types (e.g. node groups) did not work, they
were always linked after a recent bugfix.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/library.c

Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c	2013-07-04 11:37:32 UTC (rev 57993)
+++ trunk/blender/source/blender/blenkernel/intern/library.c	2013-07-04 13:03:08 UTC (rev 57994)
@@ -1573,7 +1573,9 @@
 			{
 				if (lib == NULL || id->lib == lib) {
 					if (id->lib) {
-						id_make_local(id, false);
+						/* try make local, if not implemented fall back */
+						if (!id_make_local(id, false))
+							id_clear_lib_data(bmain, id);
 
 						/* why sort alphabetically here but not in
 						 * id_clear_lib_data() ? - campbell */