diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-07-04 14:13:49 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-07-04 14:13:49 +0300 |
| commit | f23ed929ee021e11e8d47973d25f9039e9f91c17 (patch) | |
| tree | 32cd0f2a4dbb59a639a9523a72e0211fb69bd98b /source/blender/editors/space_view3d/drawarmature.c | |
| parent | fc8f6e8f7a3fcc3b17ee7db6291fb9dcb71dc185 (diff) | |
| parent | f86b43e130cb0a1d5a460cc72bcd979c479215bc (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/makesdna/DNA_particle_types.h
Diffstat (limited to 'source/blender/editors/space_view3d/drawarmature.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 5845a53055c..35ccd385d02 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -2099,6 +2099,11 @@ static void draw_pose_bones(Scene *scene, SceneLayer *sl, View3D *v3d, ARegion * } } + /* custom bone may draw outline double-width */ + if (arm->flag & ARM_POSEMODE) { + glLineWidth(1.0f); + } + /* draw custom bone shapes as wireframes */ if (!(arm->flag & ARM_NO_CUSTOM) && (draw_wire || (dt <= OB_WIRE)) ) @@ -2164,11 +2169,6 @@ static void draw_pose_bones(Scene *scene, SceneLayer *sl, View3D *v3d, ARegion * index = -1; } } - - /* custom bone may draw outline double-width */ - if (arm->flag & ARM_POSEMODE) { - glLineWidth(1.0f); - } /* wire draw over solid only in posemode */ if ((dt <= OB_WIRE) || (arm->flag & ARM_POSEMODE) || ELEM(arm->drawtype, ARM_LINE, ARM_WIRE)) { |