diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-08-27 17:29:00 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-08-27 17:29:00 +0400 |
commit | b39f4b788dc9c5ccc9430b02852cbc1cbe56eca1 (patch) | |
tree | 7a1c91c3d4235db02b231ab5f504b31c2c0e4f15 /source/blender/src/header_view3d.c | |
parent | 84205fe0e0bfc524b8fd9ba09aedbf98b0b9457b (diff) |
Texturepaint now supports all the imagepaint brush settings, with the
exception of the clone tool.
One level undo for image- and texturepaint, only storing those tiles
that changed.
Test to improve texturepaint performance using glTexSubImage2D, only
enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048
texture is then pretty smooth here, as long as the geometry is not too
complex.
Diffstat (limited to 'source/blender/src/header_view3d.c')
-rw-r--r-- | source/blender/src/header_view3d.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index a0aa801b55a..9a3b41870ba 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -86,6 +86,7 @@ #include "BDR_editface.h" #include "BDR_editmball.h" #include "BDR_editobject.h" +#include "BDR_imagepaint.h" #include "BDR_vpaint.h" #include "BIF_editlattice.h" @@ -3761,6 +3762,12 @@ static uiBlock *view3d_vpaintmenu(void *arg_unused) /* texture paint menu (placeholder, no items yet??) */ static void do_view3d_tpaintmenu(void *arg, int event) { + switch(event) { + case 0: /* undo image painting */ + imagepaint_undo(); + break; + } + allqueue(REDRAWVIEW3D, 0); } @@ -3772,6 +3779,7 @@ static uiBlock *view3d_tpaintmenu(void *arg_unused) block= uiNewBlock(&curarea->uiblocks, "view3d_paintmenu", UI_EMBOSSP, UI_HELV, curarea->headwin); uiBlockSetButmFunc(block, do_view3d_tpaintmenu, NULL); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Undo Texture Painting|U", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); if(curarea->headertype==HEADERTOP) { |