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-12-17 18:08:08 +0300
committerTon Roosendaal <ton@blender.org>2005-12-17 18:08:08 +0300
commit7fd55a735df3bfa827273643277ed2c37818fff8 (patch)
treecf899dc519906b1c850d01346120c2cde10de54d /source/blender/src/drawarmature.c
parent80e59705e1508b531d37fb03a1f55cd49f437a39 (diff)
Orange: bugfix, in armature "Stick" drawmode, the new "Custom Bone" option
didn't draw in solid.
Diffstat (limited to 'source/blender/src/drawarmature.c')
-rw-r--r--source/blender/src/drawarmature.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/drawarmature.c b/source/blender/src/drawarmature.c
index 592d4ec4510..3843eedebcd 100644
--- a/source/blender/src/drawarmature.c
+++ b/source/blender/src/drawarmature.c
@@ -1362,7 +1362,7 @@ static void draw_pose_channels(Base *base, int dt)
glEnable(GL_CULL_FACE);
/* if solid we draw that first, with selection codes, but without names, axes etc */
- if(dt>OB_WIRE && arm->drawtype!=ARM_LINE) {
+ if(dt>OB_WIRE) {
if(arm->flag & ARM_POSEMODE) index= base->selcol;
for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
@@ -1379,6 +1379,8 @@ static void draw_pose_channels(Base *base, int dt)
if(pchan->custom)
draw_custom_bone(pchan->custom, OB_SOLID, arm->flag, flag, index, bone->length);
+ else if(arm->drawtype==ARM_LINE)
+ ; /* nothing in solid */
else if(arm->drawtype==ARM_ENVELOPE)
draw_sphere_bone(OB_SOLID, arm->flag, flag, 0, index, pchan, NULL);
else if(arm->drawtype==ARM_B_BONE)