diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2016-02-11 22:54:24 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2016-02-11 23:00:27 +0300 |
commit | e8d7a0206e994786e2556699d13d54e9517bcbb9 (patch) | |
tree | 79a27cb3c079bf9ba9d8502f8511ed52e32ab1e6 /source/blender/editors/space_view3d/drawobject.c | |
parent | 7428ccfd6d477c879e67b781885acc32f89be993 (diff) |
Fix more cases where gpencil thickness controls line thickness of 3D view elements
We now simple set glLineWidth to 1 once before drawing objects. This way we don't have to do it all over.
Fixes T47396.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 38af8b70ff4..0874862a8bf 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -7503,6 +7503,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short /* only once set now, will be removed too, should become a global standard */ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + /* reset here to avoid having to call all over */ + glLineWidth(1.0f); view3d_cached_text_draw_begin(); @@ -7634,7 +7636,6 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short } } else if (ED_view3d_boundbox_clip(rv3d, ob->bb)) { - glLineWidth(1.0f); empty_object = drawDispList(scene, v3d, rv3d, base, dt, dflag, ob_wire_col); } break; @@ -7707,7 +7708,6 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short draw_bounding_volume(ob, ob->boundtype); } else { - glLineWidth(1.0f); empty_object = draw_armature(scene, v3d, ar, base, dt, dflag, ob_wire_col, false); } } |