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
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-05-30 17:20:13 +0400
committerTon Roosendaal <ton@blender.org>2005-05-30 17:20:13 +0400
commit51640e61b6a226a647588658865be1ab722f70bf (patch)
treeb5239d577c1a3cb6fe864ae555b044583bb66835
parent139106ca8530f2c8356ba2b1e3e51a968af30ff9 (diff)
Stricter check for setting posemode. It is possible to have armaturesv2.37
linked around to more scenes, which confuses the POSEMODE object flag. Now posemode is only entered on file read when it is also the active object.
-rw-r--r--source/blender/blenkernel/intern/blender.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 466c69ce639..2b7a5b446e5 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -385,7 +385,10 @@ static void setup_app_data(BlendFileData *bfd, char *filename)
for(base= G.scene->base.first; base; base=base->next) {
ob= base->object;
if(ob->flag & OB_POSEMODE) {
- if(ob->type==OB_ARMATURE) G.obpose= ob;
+ if(ob->type==OB_ARMATURE && G.scene->basact && G.scene->basact->object==ob)
+ G.obpose= ob;
+ else
+ ob->flag &= ~OB_POSEMODE;
}
}