disable object outline draw when painting (its distracting), also fix for own recent mistake in vgroup_blend(). - had bad check for editmesh.

2 files changed, 4 insertions, 2 deletions

diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 6a144ad748b..7328cbb2e7a 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -1254,7 +1254,7 @@ static void vgroup_blend(Object *ob)
 
 	BMEditMesh *em;
 
-	if (ob->type == OB_MESH && ((em = BMEdit_FromObject(ob)) != NULL)) {
+	if (ob->type != OB_MESH || ((em = BMEdit_FromObject(ob)) == NULL)) {
 		return;
 	}
 
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 9dd9636a271..43fde303dcd 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3187,7 +3187,9 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 static void draw_mesh_object_outline(View3D *v3d, Object *ob, DerivedMesh *dm)
 {
 	
-	if (v3d->transp==0) {	// not when we draw the transparent pass
+	if ((v3d->transp == FALSE) &&  /* not when we draw the transparent pass */
+	    (ob->mode & OB_MODE_ALL_PAINT) == FALSE) /* not when painting (its distracting) - campbell */
+	{
 		glLineWidth(UI_GetThemeValuef(TH_OUTLINE_WIDTH) * 2.0f);
 		glDepthMask(0);