- fixed ridiculous old bug that didn't allow weightpainting with the

  option "Area" in paint buttons set.
  Apparently reevan forgot to check on some old vertexpaint globals
  hanging around, preventing the routine from sampling the backbuffer.

  Now weightpaint works identical to vertexpaint for 'area' or 'no area'.

1 files changed, 1 insertions, 5 deletions

diff --git a/source/blender/src/vpaint.c b/source/blender/src/vpaint.c
index 36317c7f2d7..2f8a2d7b2c2 100644
--- a/source/blender/src/vpaint.c
+++ b/source/blender/src/vpaint.c
@@ -276,12 +276,12 @@ void copy_vpaint_undo(unsigned int *mcol, int tot)
 {
 	if(vpaintundobuf) MEM_freeN(vpaintundobuf);
 	vpaintundobuf= 0;
+	totvpaintundo= tot;	// because of return, it is used by weightpaint
 	
 	if(mcol==0 || tot==0) return;
 	
 	vpaintundobuf= MEM_mallocN(4*sizeof(int)*tot, "vpaintundobuf");
 	memcpy(vpaintundobuf, mcol, 4*sizeof(int)*tot);
-	totvpaintundo= tot;
 	
 }
 
@@ -794,10 +794,6 @@ void weight_paint(void)
 	if(me==0 || me->totface==0) return;
 	if(ob->lay & G.vd->lay); else error("Active object not in this layer!");
 	
-//	if(me->tface==NULL && me->mcol==NULL) make_vertexcol();
-
-//	if(me->tface==NULL && me->mcol==NULL) return;
-	
 	persp(PERSP_VIEW);
 	/* imat for normals */
 	Mat4MulMat4(mat, ob->obmat, G.vd->viewmat);