Editmesh: add ability to show weights on wire T39054, D585

1 files changed, 15 insertions, 1 deletions

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index ce74c547610..5ec15a28c36 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -37,6 +37,7 @@
 #include "DNA_customdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_group_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lamp_types.h"
 #include "DNA_scene_types.h"
@@ -2607,12 +2608,25 @@ static void view3d_draw_objects(
 	/* set zbuffer after we draw clipping region */
 	if (v3d->drawtype > OB_WIRE) {
 		v3d->zbuf = true;
-		glEnable(GL_DEPTH_TEST);
 	}
 	else {
 		v3d->zbuf = false;
 	}
 
+	/* special case (depth for wire color) */
+	if (v3d->drawtype <= OB_WIRE) {
+		if (scene->obedit && scene->obedit->type == OB_MESH) {
+			Mesh *me = scene->obedit->data;
+			if (me->drawflag & ME_DRAWEIGHT) {
+				v3d->zbuf = true;
+			}
+		}
+	}
+
+	if (v3d->zbuf) {
+		glEnable(GL_DEPTH_TEST);
+	}
+
 	if (!draw_offscreen) {
 		/* needs to be done always, gridview is adjusted in drawgrid() now, but only for ortho views. */
 		rv3d->gridview = v3d->grid;