[Bf-blender-cvs] [ce4a821] blender-v2.77-release: Curve/line width change broke outline drawing

Campbell Barton noreply at git.blender.org
Fri Mar 4 17:36:17 CET 2016


Commit: ce4a8210b395f05f4fdb6162c5e67d66a2dd850a
Author: Campbell Barton
Date:   Fri Mar 4 14:43:39 2016 +1100
Branches: blender-v2.77-release
https://developer.blender.org/rBce4a8210b395f05f4fdb6162c5e67d66a2dd850a

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 64c01b8..7c1f1d4 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