diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-15 18:20:31 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-15 18:20:31 +0400 |
| commit | a1d611e9bd3379dd2c002cd5a895c788962a19a5 (patch) | |
| tree | 3c4bedb765464e1f2deadf2b1124c1228cd3d7e7 /source/blender/src/editface.c | |
| parent | 039ed9cb7f3edd2cae640065979aed4a7eb31103 (diff) | |
svn merge -r 16231:16536 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/src/editface.c')
| -rw-r--r-- | source/blender/src/editface.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c index 781210cd373..008ddf3b5f0 100644 --- a/source/blender/src/editface.c +++ b/source/blender/src/editface.c @@ -82,13 +82,14 @@ #include "BIF_space.h" /* for allqueue */ #include "BIF_drawimage.h" /* for allqueue */ -#include "BDR_drawmesh.h" #include "BDR_editface.h" #include "BDR_vpaint.h" #include "BDR_editface.h" #include "BDR_vpaint.h" +#include "GPU_draw.h" + #include "mydevice.h" #include "blendef.h" #include "butspace.h" @@ -1315,7 +1316,7 @@ void set_texturepaint() /* toggle */ if(G.f & G_TEXTUREPAINT) { G.f &= ~G_TEXTUREPAINT; - texpaint_enable_mipmap(); + GPU_paint_set_mipmap(1); } else if (me) { G.f |= G_TEXTUREPAINT; @@ -1324,7 +1325,7 @@ void set_texturepaint() /* toggle */ make_tfaces(me); brush_check_exists(&G.scene->toolsettings->imapaint.brush); - texpaint_disable_mipmap(); + GPU_paint_set_mipmap(0); } allqueue(REDRAWVIEW3D, 0); |