diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-09-08 15:13:34 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-09-08 15:13:34 +0400 |
| commit | da474210de8871ea2a6dfcd2bfa37a71f9f6aed8 (patch) | |
| tree | c0cea55f4f5d51bb37790235bcf4e9e0c8e6eac3 /source | |
| parent | 6a83746fb33d3803b212a26ca72882d55127009d (diff) | |
Bug #17317
Vertexpaint mode: option "paint mask" (Fkey) missed redraw for buttons
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/include/blendef.h | 1 | ||||
| -rw-r--r-- | source/blender/src/header_view3d.c | 8 | ||||
| -rw-r--r-- | source/blender/src/space.c | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h index 228530db445..a7f7bc2e4b8 100644 --- a/source/blender/include/blendef.h +++ b/source/blender/include/blendef.h @@ -241,6 +241,7 @@ #define B_SEL_END 168 #define B_MAN_MODE 169 #define B_NDOF 170 +#define B_VIEW_BUTSEDIT 171 /* IPO: 200 */ #define B_IPOHOME 201 diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index c8a006a8221..704d4bdea54 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -5387,7 +5387,11 @@ void do_view3d_buttons(short event) case B_MAN_MODE: allqueue(REDRAWVIEW3D, 1); break; - + case B_VIEW_BUTSEDIT: + allqueue(REDRAWVIEW3D, 1); + allqueue(REDRAWBUTSEDIT, 1); + break; + default: if(event>=B_LAY && event<B_LAY+31) { @@ -5680,7 +5684,7 @@ void view3d_buttons(void) } } else { if (G.obedit==NULL && (G.f & (G_VERTEXPAINT|G_WEIGHTPAINT|G_TEXTUREPAINT))) { - uiDefIconButBitI(block, TOG, G_FACESELECT, B_REDR, ICON_FACESEL_HLT,xco,0,XIC,YIC, &G.f, 0, 0, 0, 0, "Painting Mask (FKey)"); + uiDefIconButBitI(block, TOG, G_FACESELECT, B_VIEW_BUTSEDIT, ICON_FACESEL_HLT,xco,0,XIC,YIC, &G.f, 0, 0, 0, 0, "Painting Mask (FKey)"); xco+= XIC+10; } else { /* Manipulators arnt used in weight paint mode */ diff --git a/source/blender/src/space.c b/source/blender/src/space.c index fe06f66bec7..749b097a21b 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -2062,6 +2062,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) if (G.f & (G_VERTEXPAINT|G_WEIGHTPAINT|G_TEXTUREPAINT)){ G.f ^= G_FACESELECT; allqueue(REDRAWVIEW3D, 1); + allqueue(REDRAWBUTSEDIT, 1); } else if(G.f & G_PARTICLEEDIT) { PE_radialcontrol_start(RADIALCONTROL_SIZE); |