[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53035] trunk/blender/source/blender: minor edits with recent commits, also avoid calling BKE_mesh_from_object() in vertex paint, just pass the mesh.

[Campbell Barton]

Revision: 53035
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53035
Author:   campbellbarton
Date:     2012-12-15 16:31:25 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
minor edits with recent commits, also avoid calling BKE_mesh_from_object() in vertex paint, just pass the mesh.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_bpath.h
    trunk/blender/source/blender/blenkernel/BKE_pbvh.h
    trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c

Modified: trunk/blender/source/blender/blenkernel/BKE_bpath.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_bpath.h	2012-12-15 16:27:12 UTC (rev 53034)
+++ trunk/blender/source/blender/blenkernel/BKE_bpath.h	2012-12-15 16:31:25 UTC (rev 53035)
@@ -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
  */

Modified: trunk/blender/source/blender/blenkernel/BKE_pbvh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_pbvh.h	2012-12-15 16:27:12 UTC (rev 53034)
+++ trunk/blender/source/blender/blenkernel/BKE_pbvh.h	2012-12-15 16:31:25 UTC (rev 53035)
@@ -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.
  */
 

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2012-12-15 16:27:12 UTC (rev 53034)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2012-12-15 16:31:25 UTC (rev 53035)
@@ -2646,13 +2646,12 @@
 	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 @@
 
 	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);
 		}
 	}