Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-12-30 19:33:15 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2014-12-30 19:33:15 +0300
commit016bbc879329390041909d524e3b41834b6853d3 (patch)
treee8a95dbab5b3c0f18c6794f16f3fcd1544e9d9eb /source
parentcefb76426980b763bbf68f022fc0df8aec8a25bd (diff)
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.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenloader/intern/readfile.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 0950edac46a..a6001e6716f 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);