[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29988] trunk/blender/source/blender: Fix #21992: linked objects could be in edit/particle/paint/sculpt mode,

[Brecht Van Lommel]

Revision: 29988
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29988
Author:   blendix
Date:     2010-07-05 15:14:14 +0200 (Mon, 05 Jul 2010)

Log Message:
-----------
Fix #21992: linked objects could be in edit/particle/paint/sculpt mode,
not allowed, so disable mode on append and don't enable it on load.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/util/ed_util.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-07-05 12:52:47 UTC (rev 29987)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-07-05 13:14:14 UTC (rev 29988)
@@ -12136,6 +12136,7 @@
 							ob->lay = scene->lay;
 						}
 					}
+					ob->mode= 0;
 					base->lay= ob->lay;
 					base->object= ob;
 					ob->id.us++;

Modified: trunk/blender/source/blender/editors/util/ed_util.c
===================================================================
--- trunk/blender/source/blender/editors/util/ed_util.c	2010-07-05 12:52:47 UTC (rev 29987)
+++ trunk/blender/source/blender/editors/util/ed_util.c	2010-07-05 13:14:14 UTC (rev 29988)
@@ -56,6 +56,7 @@
 	Main *bmain= CTX_data_main(C);
 	Scene *sce= CTX_data_scene(C);
 	Object *ob, *obact= (sce && sce->basact)? sce->basact->object: NULL;
+	ID *data;
 
 	/* toggle on modes for objects that were saved with these enabled. for
 	   e.g. linked objects we have to ensure that they are actually the
@@ -65,8 +66,9 @@
 
 		if(mode && (mode != OB_MODE_POSE)) {
 			ob->mode= 0;
+			data= ob->data;
 
-			if(ob == obact)
+			if(ob == obact && !ob->id.lib && !(data && data->lib))
 				ED_object_toggle_modes(C, mode);
 		}
 	}