[Bf-blender-cvs] [4ec61ff] master: Curve/line width change broke outline drawing
Campbell Barton
noreply at git.blender.org
Fri Mar 4 05:01:26 CET 2016
Commit: 4ec61ff9f62ffe6ad26bba8a9c5f1250b9d464e8
Author: Campbell Barton
Date: Fri Mar 4 14:43:39 2016 +1100
Branches: master
https://developer.blender.org/rB4ec61ff9f62ffe6ad26bba8a9c5f1250b9d464e8
Curve/line width change broke outline drawing
Partially revert e29a5ba6
===================================================================
M source/blender/editors/space_view3d/drawobject.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 29ebc6a..b4571e5 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));
}
}
}
More information about the Bf-blender-cvs
mailing list