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:38:32 +0300 |
| commit | 3f05797333dd86279f33e1868b3dd737a1f3a825 (patch) | |
| tree | 97699f755db4aafb191636e83c7f5a95339a123e /source | |
| parent | 29d2c71117809fea3c9d11a872e422b85847d93b (diff) | |
Followup to fe3e000: no need to exit pose mode on operator redo
This is to be backported to the release branch.
Diffstat (limited to 'source')
| -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 c4ce60b08a9..7e10bff49a4 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); |