[Bf-blender-cvs] [216aacb] strand_editmode: Disable regular mesh drawing in hair edit mode.

[Lukas Tönne]

Commit: 216aacbcba55ee92bebccb33f587c77ac562cdaa
Author: Lukas Tönne
Date:   Tue Apr 19 12:06:53 2016 +0200
Branches: strand_editmode
https://developer.blender.org/rB216aacbcba55ee92bebccb33f587c77ac562cdaa

Disable regular mesh drawing in hair edit mode.

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

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 2356c5b..b292c63 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7634,7 +7634,10 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 	if (!skip_object) {
 		/* draw outline for selected objects, mesh does itself */
 		if ((v3d->flag & V3D_SELECT_OUTLINE) && !render_override && ob->type != OB_MESH) {
-			if (dt > OB_WIRE && (ob->mode & OB_MODE_EDIT) == 0 && (dflag & DRAW_SCENESET) == 0) {
+			if (dt > OB_WIRE &&
+			    (ob->mode & (OB_MODE_EDIT | OB_MODE_HAIR_EDIT)) == 0 &&
+			    (dflag & DRAW_SCENESET) == 0)
+			{
 				if (!(ob->dtx & OB_DRAWWIRE) && (ob->flag & SELECT) && !(dflag & (DRAW_PICKING | DRAW_CONSTCOLOR))) {
 					drawObjectSelect(scene, v3d, ar, base, ob_wire_col);
 				}