[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57995] trunk/blender/source/blender/ blenkernel/intern/library.c: Revert revision 57896 to fix Make Local > All with multi user datablocks.

[Brecht Van Lommel]

Revision: 57995
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57995
Author:   blendix
Date:     2013-07-04 14:11:42 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Revert revision 57896 to fix Make Local > All with multi user datablocks. It's
causing problems with link/append, needs some deeper changes but it's too close
to release for that.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57896

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 13:03:08 UTC (rev 57994)
+++ trunk/blender/source/blender/blenkernel/intern/library.c	2013-07-04 14:11:42 UTC (rev 57995)
@@ -1573,9 +1573,10 @@
 			{
 				if (lib == NULL || id->lib == lib) {
 					if (id->lib) {
-						/* try make local, if not implemented fall back */
-						if (!id_make_local(id, false))
-							id_clear_lib_data(bmain, id);
+						/* for Make Local > All we should be calling id_make_local,
+						 * but doing that breaks append (see #36003 and #36006), we
+						 * we should make it work with all datablocks and id.us==0 */
+						id_clear_lib_data(bmain, id); /* sets 'id->flag' */
 
 						/* why sort alphabetically here but not in
 						 * id_clear_lib_data() ? - campbell */