minor edits with recent commits, also avoid calling BKE_mesh_from_object() in vertex...
authorCampbell Barton <ideasman42@gmail.com>
Sat, 15 Dec 2012 16:31:25 +0000 (16:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 15 Dec 2012 16:31:25 +0000 (16:31 +0000)
source/blender/blenkernel/BKE_bpath.h
source/blender/blenkernel/BKE_pbvh.h
source/blender/editors/sculpt_paint/paint_vertex.c

index 7c350fd..16a8b1b 100644 (file)
@@ -26,7 +26,7 @@
  */
 
 /** \file BKE_bpath.h
- *  \ingroup bli
+ *  \ingroup bke
  *  \attention Based on ghash, difference is ghash is not a fixed size,
  *   so for BPath we don't need to malloc
  */
index 59ecdb3..302de59 100644 (file)
@@ -21,8 +21,8 @@
 #ifndef __BLI_PBVH_H__
 #define __BLI_PBVH_H__
 
-/** \file BLI_pbvh.h
- *  \ingroup bli
+/** \file BKE_pbvh.h
+ *  \ingroup bke
  *  \brief A BVH for high poly meshes.
  */
 
index 073aee1..a7d75c6 100644 (file)
@@ -2646,13 +2646,12 @@ static int vpaint_stroke_test_start(bContext *C, struct wmOperator *op, const fl
        return 1;
 }
 
-static void vpaint_paint_poly(VPaint *vp, VPaintData *vpd, Object *ob,
+static void vpaint_paint_poly(VPaint *vp, VPaintData *vpd, Mesh *me,
                               const unsigned int index, const float mval[2],
                               const float brush_size_pressure, const float brush_alpha_pressure)
 {
        ViewContext *vc = &vpd->vc;
        Brush *brush = paint_brush(&vp->paint);
-       Mesh *me = BKE_mesh_from_object(ob);
        MPoly *mpoly = &me->mpoly[index];
        MFace *mf;
        MCol *mc;
@@ -2786,7 +2785,7 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 
        for (index = 0; index < totindex; index++) {
                if (indexar[index] && indexar[index] <= me->totpoly) {
-                       vpaint_paint_poly(vp, vpd, ob, indexar[index] - 1, mval, brush_size_pressure, brush_alpha_pressure);
+                       vpaint_paint_poly(vp, vpd, me, indexar[index] - 1, mval, brush_size_pressure, brush_alpha_pressure);
                }
        }