diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 16:33:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 16:33:11 +0400 |
commit | 094ab4af034a94402a73c2f661dde600cd3ee334 (patch) | |
tree | ef142e8f0d16ffd384d17fa32dcb2b48877fcb1d /source/blender/editors/space_view3d/drawarmature.c | |
parent | dc907ef876b128c9767394d00dfc719d55ba077e (diff) | |
parent | 4ea8cb25295d0e61a1fcf1cd16028a3586ed5921 (diff) |
Merge fixes from trunk into 2.60a tag:v2.60a
svn merge ^/trunk/blender \
-c41113 \
-c41117 \
-c41128 \
-c41132 \
-c41134 \
-c41151 \
-c41152 \
-c41175 \
-c41197 \
-c41203 \
-c41211 \
-c41214 \
-c41219
Diffstat (limited to 'source/blender/editors/space_view3d/drawarmature.c')
-rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 83a695ba72a..eed86467eaa 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -1839,7 +1839,7 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base, } /* wire draw over solid only in posemode */ - if ((dt <= OB_WIRE) || (arm->flag & ARM_POSEMODE) || (arm->drawtype==ARM_LINE)) { + if ((dt <= OB_WIRE) || (arm->flag & ARM_POSEMODE) || ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)) { /* draw line check first. we do selection indices */ if ELEM(arm->drawtype, ARM_LINE, ARM_WIRE) { if (arm->flag & ARM_POSEMODE) @@ -2512,7 +2512,7 @@ int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt, in if(v3d->flag2 & V3D_RENDER_OVERRIDE) return 1; - if(dt>OB_WIRE && arm->drawtype!=ARM_LINE) { + if(dt>OB_WIRE && !ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)) { /* we use color for solid lighting */ glColorMaterial(GL_FRONT_AND_BACK, GL_SPECULAR); glEnable(GL_COLOR_MATERIAL); |