diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-11-26 03:52:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-26 03:52:37 +0300 |
| commit | a7cce73fd0614ae65568f001bad4d068178e2094 (patch) | |
| tree | 7c2bb77e1acff047f6ca84c6b0c2f2233a65b7d1 | |
| parent | b0df3a29f2b3032bbbe1d631fa15cbdc59272402 (diff) | |
fix [#24900] Texture paint mode broken
own commit r33070 broke this.
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 6e20bcb37ef..0920144f0a2 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2509,7 +2509,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D 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) { |