[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33321] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: fix [#24900] Texture paint mode broken

[Campbell Barton]

Revision: 33321
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33321
Author:   campbellbarton
Date:     2010-11-26 01:52:37 +0100 (Fri, 26 Nov 2010)

Log Message:
-----------
fix [#24900] Texture paint mode broken
own commit r33070 broke this.

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	2010-11-25 22:15:04 UTC (rev 33320)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-11-26 00:52:37 UTC (rev 33321)
@@ -2509,7 +2509,7 @@
 	else if(dt==OB_WIRE || totface==0) {
 		draw_wire = 1; /* draw wire only, no depth buffer stuff  */
 	}
-	else if(	(is_paint_sel && (ob->mode & OB_MODE_TEXTURE_PAINT)) ||
+	else if(	(is_paint_sel || (ob==OBACT && ob->mode & OB_MODE_TEXTURE_PAINT)) ||
 				CHECK_OB_DRAWTEXTURE(v3d, dt))
 	{
 		if ((v3d->flag&V3D_SELECT_OUTLINE) && ((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) && (base->flag&SELECT) && !(G.f&G_PICKSEL || is_paint_sel) && !draw_wire) {