[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16420] trunk/blender/source/blender: Bug #17317

[Ton Roosendaal]

Revision: 16420
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16420
Author:   ton
Date:     2008-09-08 13:13:34 +0200 (Mon, 08 Sep 2008)

Log Message:
-----------
Bug #17317

Vertexpaint mode: option "paint mask" (Fkey) missed redraw for buttons

Modified Paths:
--------------
    trunk/blender/source/blender/include/blendef.h
    trunk/blender/source/blender/src/header_view3d.c
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/include/blendef.h
===================================================================
--- trunk/blender/source/blender/include/blendef.h	2008-09-08 10:31:00 UTC (rev 16419)
+++ trunk/blender/source/blender/include/blendef.h	2008-09-08 11:13:34 UTC (rev 16420)
@@ -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

Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c	2008-09-08 10:31:00 UTC (rev 16419)
+++ trunk/blender/source/blender/src/header_view3d.c	2008-09-08 11:13:34 UTC (rev 16420)
@@ -5387,7 +5387,11 @@
 	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 @@
  		}
  	} 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 */

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2008-09-08 10:31:00 UTC (rev 16419)
+++ trunk/blender/source/blender/src/space.c	2008-09-08 11:13:34 UTC (rev 16420)
@@ -2062,6 +2062,7 @@
 					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);