diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-07 13:38:32 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-07 13:44:49 +0300 |
| commit | a52fe40c8402dce17ddc4c99d51f19c5d374cb5a (patch) | |
| tree | d3d995c0752a09013a0e2edfa048634628fd8b0c | |
| parent | fedb34c592b1ad5fd6c3d498c495d7fcfb702788 (diff) | |
Followup to fe3e000: no need to exit pose mode on operator redo
This is to be backported to the release branch.
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index a6001e6716f..a9fc1c38735 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4914,7 +4914,10 @@ static void direct_link_object(FileData *fd, Object *ob) * 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_POSE); + ob->mode &= ~(OB_MODE_EDIT | OB_MODE_PARTICLE_EDIT); + if (!fd->memfile) { + ob->mode &= ~OB_MODE_POSE; + } } ob->adt = newdataadr(fd, ob->adt); |