Bug #17317
authorTon Roosendaal <ton@blender.org>
Mon, 8 Sep 2008 11:13:34 +0000 (11:13 +0000)
committerTon Roosendaal <ton@blender.org>
Mon, 8 Sep 2008 11:13:34 +0000 (11:13 +0000)
Vertexpaint mode: option "paint mask" (Fkey) missed redraw for buttons

source/blender/include/blendef.h
source/blender/src/header_view3d.c
source/blender/src/space.c

index 228530db4458616abd2d7573ec06ddeb217c15d4..a7f7bc2e4b86e48fcd93cae0635fae87ceaa4a8f 100644 (file)
 #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
index c8a006a8221661df1c8fa773d2bd3d1b69af0ed5..704d4bdea5450e1159bbb9b96e31db97654345a0 100644 (file)
@@ -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 */
index fe06f66bec7d994ca470186461cb83d5cf3ea210..749b097a21b2713b25858b5c649e6bb285605da6 100644 (file)
@@ -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);