[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59527] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Don' t check for an object mode that is excluded as a prerequisite for

[Antony Riakiotakis]

Revision: 59527
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59527
Author:   psy-fi
Date:     2013-08-26 14:58:16 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Don't check for an object mode that is excluded as a prerequisite for
entering this branch of code.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-08-26 14:53:40 UTC (rev 59526)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-08-26 14:58:16 UTC (rev 59527)
@@ -6656,23 +6656,17 @@
 
 	/* faceselect exception: also draw solid when (dt == wire), except in editmode */
 	if (is_obact && (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))) {
-		if (ob->type == OB_MESH) {
-
-			if (ob->mode & OB_MODE_EDIT) {
-				/* pass */
+		if (ob->type == OB_MESH) {			
+			if (dt < OB_SOLID) {
+				zbufoff = 1;
+				dt = OB_SOLID;
 			}
-			else {
-				if (dt < OB_SOLID) {
-					zbufoff = 1;
-					dt = OB_SOLID;
-				}
 
-				if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) {
-					dt = OB_PAINT;
-				}
-
-				glEnable(GL_DEPTH_TEST);
+			if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) {
+				dt = OB_PAINT;
 			}
+
+			glEnable(GL_DEPTH_TEST);
 		}
 		else {
 			if (dt < OB_SOLID) {