[Bf-blender-cvs] [fe3e000] blender-v2.73-release: Fix T42780: Object linking allows to have linked armatures in pose mode

Sergey Sharybin noreply at git.blender.org
Tue Jan 6 10:44:53 CET 2015


Commit: fe3e000511113213fc4dd2d641ee6e1962354977
Author: Sergey Sharybin
Date:   Tue Dec 30 21:33:15 2014 +0500
Branches: blender-v2.73-release
https://developer.blender.org/rBfe3e000511113213fc4dd2d641ee6e1962354977

Fix T42780: Object linking allows to have linked armatures in pose mode

This isn't so bad for until one goes re-posing the armature and then uses undo.

It is the same issue as with edit mode which was solved back in the days.

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

M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 0950eda..a6001e6 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4910,9 +4910,11 @@ static void direct_link_object(FileData *fd, Object *ob)
 	/* loading saved files with editmode enabled works, but for undo we like
 	 * to stay in object mode during undo presses so keep editmode disabled.
 	 *
-	 * Also when linking in a file don't allow editmode: [#34776] */
+	 * Also when linking in a file don't allow edit and pose modes.
+	 * See [#34776, #42780] for more information.
+	 */
 	if (fd->memfile || (ob->id.flag & (LIB_EXTERN | LIB_INDIRECT))) {
-		ob->mode &= ~(OB_MODE_EDIT | OB_MODE_PARTICLE_EDIT);
+		ob->mode &= ~(OB_MODE_EDIT | OB_MODE_PARTICLE_EDIT | OB_MODE_POSE);
 	}
 	
 	ob->adt = newdataadr(fd, ob->adt);




More information about the Bf-blender-cvs mailing list