diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-10 02:00:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-10 02:00:40 +0400 |
| commit | a2e00c62303228ae85f54a2b8fffb8c5e071640e (patch) | |
| tree | 2bcd3ed149b684d70434096e7562337887fbd85d /source/blender/editors/space_view3d | |
| parent | 4dc35836addfcdc888c2e9e6129eb8a3604efa9b (diff) | |
disable object outline draw when painting (its distracting), also fix for own recent mistake in vgroup_blend(). - had bad check for editmesh.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 9dd9636a271..43fde303dcd 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3187,7 +3187,9 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, static void draw_mesh_object_outline(View3D *v3d, Object *ob, DerivedMesh *dm) { - if (v3d->transp==0) { // not when we draw the transparent pass + if ((v3d->transp == FALSE) && /* not when we draw the transparent pass */ + (ob->mode & OB_MODE_ALL_PAINT) == FALSE) /* not when painting (its distracting) - campbell */ + { glLineWidth(UI_GetThemeValuef(TH_OUTLINE_WIDTH) * 2.0f); glDepthMask(0); |