[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59321] trunk/blender/source/blender/ blenkernel: missed return in last commit, also use bool return types.
Campbell Barton
ideasman42 at gmail.com
Tue Aug 20 11:45:26 CEST 2013
Revision: 59321
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59321
Author: campbellbarton
Date: 2013-08-20 09:45:26 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
missed return in last commit, also use bool return types.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_mesh.h
trunk/blender/source/blender/blenkernel/intern/mesh.c
Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mesh.h 2013-08-20 09:42:18 UTC (rev 59320)
+++ trunk/blender/source/blender/blenkernel/BKE_mesh.h 2013-08-20 09:45:26 UTC (rev 59321)
@@ -332,10 +332,10 @@
/* vertex level transformations & checks (no derived mesh) */
-int BKE_mesh_minmax(struct Mesh *me, float r_min[3], float r_max[3]);
-int BKE_mesh_center_median(struct Mesh *me, float cent[3]);
-int BKE_mesh_center_bounds(struct Mesh *me, float cent[3]);
-int BKE_mesh_center_centroid(struct Mesh *me, float cent[3]);
+bool BKE_mesh_minmax(struct Mesh *me, float r_min[3], float r_max[3]);
+bool BKE_mesh_center_median(struct Mesh *me, float cent[3]);
+bool BKE_mesh_center_bounds(struct Mesh *me, float cent[3]);
+bool BKE_mesh_center_centroid(struct Mesh *me, float cent[3]);
void BKE_mesh_translate(struct Mesh *me, const float offset[3], const bool do_keys);
/* mesh_validate.c */
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-08-20 09:42:18 UTC (rev 59320)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-08-20 09:45:26 UTC (rev 59321)
@@ -3667,7 +3667,7 @@
/* basic vertex data functions */
-int BKE_mesh_minmax(Mesh *me, float r_min[3], float r_max[3])
+bool BKE_mesh_minmax(Mesh *me, float r_min[3], float r_max[3])
{
int i = me->totvert;
MVert *mvert;
@@ -3678,7 +3678,7 @@
return (me->totvert != 0);
}
-int BKE_mesh_center_median(Mesh *me, float cent[3])
+bool BKE_mesh_center_median(Mesh *me, float cent[3])
{
int i = me->totvert;
MVert *mvert;
@@ -3694,19 +3694,19 @@
return (me->totvert != 0);
}
-int BKE_mesh_center_bounds(Mesh *me, float cent[3])
+bool BKE_mesh_center_bounds(Mesh *me, float cent[3])
{
float min[3], max[3];
INIT_MINMAX(min, max);
if (BKE_mesh_minmax(me, min, max)) {
mid_v3_v3v3(cent, min, max);
- return 1;
+ return true;
}
- return 0;
+ return false;
}
-int BKE_mesh_center_centroid(Mesh *me, float cent[3])
+bool BKE_mesh_center_centroid(Mesh *me, float cent[3])
{
int i = me->totpoly;
MPoly *mpoly;
@@ -3730,7 +3730,7 @@
/* zero area faces cause this, fallback to median */
if (UNLIKELY(!is_finite_v3(cent))) {
- BKE_mesh_center_median(me, cent);
+ return BKE_mesh_center_median(me, cent);
}
return (me->totpoly != 0);
More information about the Bf-blender-cvs
mailing list