svn merge ^/trunk/blender -r43338:43345
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jan 2012 08:28:51 +0000 (08:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jan 2012 08:28:51 +0000 (08:28 +0000)
1  2 
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/makesrna/intern/rna_scene.c

index a64326d8d987941513a320269314d08c3630348f,167af434853f00534d6d9cb4eb074e1a3cac6767..cdb82426473032a4d93ac364ecdc47e0f521bad1
@@@ -469,8 -389,8 +469,8 @@@ void vpaint_fill(Object *ob, unsigned i
  void wpaint_fill(VPaint *wp, Object *ob, float paintweight)
  {
        Mesh *me= ob->data;
 -      MFace *mf;
 +      MPoly *mf;
-       MDeformWeight *dw, *uw;
+       MDeformWeight *dw, *dw_prev;
        int vgroup_active, vgroup_mirror= -1;
        unsigned int index;