[Bf-blender-cvs] [e29a5ba] master: Only use outlines around faces for surface objects

Campbell Barton noreply at git.blender.org
Sat Feb 20 03:57:28 CET 2016


Commit: e29a5ba6177189a101ecf56cc77c105aa5b4b6a4
Author: Campbell Barton
Date:   Sat Feb 20 13:44:17 2016 +1100
Branches: master
https://developer.blender.org/rBe29a5ba6177189a101ecf56cc77c105aa5b4b6a4

Only use outlines around faces for surface objects

Was drawing wire when mixed with non-wire nurbs.

===================================================================

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 889d94e..871faa3 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7176,7 +7176,12 @@ static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
 				draw_mesh_object_outline(v3d, ob, dm);
 			}
 			else {
-				drawDispListwire(&ob->curve_cache->disp, ob->type);
+				/* 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));
 			}
 		}
 	}




More information about the Bf-blender-cvs mailing list