[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51585] trunk/blender/source/blender/ blenkernel/intern/object.c: Bugfix #32496

[Ton Roosendaal]

Revision: 51585
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51585
Author:   ton
Date:     2012-10-24 13:24:34 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Bugfix #32496

You don't believe it, this bug traces back to 2002. Went by unreported for a decade.

If you link in an object, delete it, and relink again its materials are lost!
Easy fix, annoying error. :)

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

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2012-10-24 12:57:48 UTC (rev 51584)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2012-10-24 13:24:34 UTC (rev 51585)
@@ -300,11 +300,11 @@
 	
 	BKE_object_free_display(ob);
 	
-	/* disconnect specific data */
+	/* disconnect specific data, but not for lib data (might be indirect data, can get relinked) */
 	if (ob->data) {
 		ID *id = ob->data;
 		id->us--;
-		if (id->us == 0) {
+		if (id->us == 0 && id->lib==NULL) {
 			switch (ob->type) {
 				case OB_MESH:
 					BKE_mesh_unlink((Mesh *)id);