diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-11-11 21:17:53 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-11-11 21:17:53 +0300 |
| commit | dddc04f0c46d6cc8943f1170cbc9d1d68eefe125 (patch) | |
| tree | 368cd6b68556e92336cc3b186770e3309838db1c /source/blender/src | |
| parent | c41823cdb69db3533a5a797ccbe524300a81b7eb (diff) | |
Bugfix #5208
Dupli-group, with armature in PoseMode, made selections not work.
Weird that this wasn't reported before :)
Diffstat (limited to 'source/blender/src')
| -rw-r--r-- | source/blender/src/drawarmature.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/source/blender/src/drawarmature.c b/source/blender/src/drawarmature.c index 4f554530675..cb786c651d6 100644 --- a/source/blender/src/drawarmature.c +++ b/source/blender/src/drawarmature.c @@ -1898,23 +1898,25 @@ int draw_armature(Base *base, int dt) /* Draw Pose */ if(ob->pose && ob->pose->chanbase.first) { /* drawing posemode selection indices or colors only in these cases */ - if(G.f & G_PICKSEL) { - if(ob->flag & OB_POSEMODE) arm->flag |= ARM_POSEMODE; - } - else if(ob->flag & OB_POSEMODE) { - - if(arm->ghostep) { - draw_ghost_poses(base); + if(!(base->flag & OB_FROMDUPLI)) { + if(G.f & G_PICKSEL) { + if(ob->flag & OB_POSEMODE) + arm->flag |= ARM_POSEMODE; } - - if(ob==OBACT) - arm->flag |= ARM_POSEMODE; - else if(G.f & G_WEIGHTPAINT) - arm->flag |= ARM_POSEMODE; - - draw_pose_paths(ob); - } - + else if(ob->flag & OB_POSEMODE) { + + if(arm->ghostep) { + draw_ghost_poses(base); + } + + if(ob==OBACT) + arm->flag |= ARM_POSEMODE; + else if(G.f & G_WEIGHTPAINT) + arm->flag |= ARM_POSEMODE; + + draw_pose_paths(ob); + } + } draw_pose_channels(base, dt); arm->flag &= ~ARM_POSEMODE; |