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:
authorCampbell Barton <ideasman42@gmail.com>2016-03-04 06:43:39 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-03-04 19:11:59 +0300
commitce4a8210b395f05f4fdb6162c5e67d66a2dd850a (patch)
treeaebf37523555e8430d844a2ddc233e56ccdd0a62
parent67d310459d204638278275343e9b9136d28b3e1c (diff)
Curve/line width change broke outline drawing
Partially revert e29a5ba6
-rw-r--r--source/blender/editors/space_view3d/drawobject.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 64c01b86442..7c1f1d46c26 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7194,12 +7194,8 @@ static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
draw_mesh_object_outline(v3d, ob, dm);
}
else {
- /* don't show outline on 'wire' with surfaces,
- * don't show interior tessellation with curves */
- drawDispListwire_ex(
- &ob->curve_cache->disp,
- (ob->type == OB_SURF) ?
- (DL_INDEX3 | DL_INDEX4 | DL_SURF) : (DL_SEGM | DL_POLY));
+ /* only draw 'solid' parts of the display list as wire. */
+ drawDispListwire_ex(&ob->curve_cache->disp, (DL_INDEX3 | DL_INDEX4 | DL_SURF));
}
}
}