diff options
author | Ton Roosendaal <ton@blender.org> | 2005-12-21 20:49:43 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-12-21 20:49:43 +0300 |
commit | 63c8678263af7fb5b81fbe50fc9280a7682ed3ca (patch) | |
tree | 372cdf642bd22c9632ae9eda3136055556c2531a /source/blender/src/drawarmature.c | |
parent | ce52827a0574f3c9b7054b2ddde5c8df3a9c646d (diff) |
Orange: small fixes as reported,
- follow path constraint + stride path didn't update correct on file load
- selection of 'stick' bones didn't work in object mode, solid view
- change bone layer sends redraw to NLA too
Diffstat (limited to 'source/blender/src/drawarmature.c')
-rw-r--r-- | source/blender/src/drawarmature.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/src/drawarmature.c b/source/blender/src/drawarmature.c index 865797c183d..74201b58135 100644 --- a/source/blender/src/drawarmature.c +++ b/source/blender/src/drawarmature.c @@ -1394,8 +1394,11 @@ static void draw_pose_channels(Base *base, int dt) } if (index!= -1) index+= 0x10000; // pose bones count in higher 2 bytes only } - glLoadName (index & 0xFFFF); // object tag, for bordersel optim - index= -1; + /* very very confusing... but in object mode, solid draw, we cannot do glLoadName yet, stick bones are dawn in next loop */ + if(arm->drawtype!=ARM_LINE) { + glLoadName (index & 0xFFFF); // object tag, for bordersel optim + index= -1; + } } /* wire draw over solid only in posemode */ |