[Bf-blender-cvs] [3f05797] master: Followup to fe3e000: no need to exit pose mode on operator redo

[Sergey Sharybin]

Commit: 3f05797333dd86279f33e1868b3dd737a1f3a825
Author: Sergey Sharybin
Date:   Wed Jan 7 15:38:32 2015 +0500
Branches: master
https://developer.blender.org/rB3f05797333dd86279f33e1868b3dd737a1f3a825

Followup to fe3e000: no need to exit pose mode on operator redo

This is to be backported to the release branch.

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

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

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

diff --git a/source/blender/blenloader/intern/readfile.c 
b/source/blender/blenloader/intern/readfile.c
index c4ce60b..7e10bff 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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs