[Bf-blender-cvs] [1781928] master: Fix T39305: Matcap Crash when using Material Nodes in Blender Internal

[Sergey Sharybin]

Commit: 1781928f9d720fa1dc4811afb69935b35aa89878
Author: Sergey Sharybin
Date:   Fri Mar 21 15:15:43 2014 +0600
https://developer.blender.org/rB1781928f9d720fa1dc4811afb69935b35aa89878

Fix T39305: Matcap Crash when using Material Nodes in Blender Internal

This is a regression in d34d745, texture painting didn't set is_paint
if draw type < DT_SOLID which is weird.

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

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 9bb3536..daa6ea0 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -6806,14 +6806,13 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 				if (dt < OB_SOLID) {
 					zbufoff = 1;
 					dt = OB_SOLID;
-					is_paint = true;
 				}
 
 				if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) {
 					dt = OB_PAINT;
-					is_paint = true;
 				}
 
+				is_paint = true;
 				glEnable(GL_DEPTH_TEST);
 			}
 		}