diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-18 12:00:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-18 12:00:19 +0400 |
commit | 8e641348f970f64150f3d4ec3665f967ed67efc6 (patch) | |
tree | 9ae466b94e2a405c6e681e6e10161537793be80e /source | |
parent | 3094a02e6ef272f108a633c18981af593d038ee2 (diff) |
fix own error BLI_rctf_cent_x/y were incorrectly returning int's, also quiet some warnings.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenlib/BLI_rect.h | 4 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_NodeBase.h | 2 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_NodeOperation.h | 2 | ||||
-rw-r--r-- | source/blender/editors/include/ED_mesh.h | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_bvh.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenlib/BLI_rect.h b/source/blender/blenlib/BLI_rect.h index e64fb1a72b3..0c0c7f408fc 100644 --- a/source/blender/blenlib/BLI_rect.h +++ b/source/blender/blenlib/BLI_rect.h @@ -90,8 +90,8 @@ BLI_INLINE float BLI_rcti_cent_x_fl(const struct rcti *rct) { return (float)(rct BLI_INLINE float BLI_rcti_cent_y_fl(const struct rcti *rct) { return (float)(rct->ymin + rct->ymax) / 2.0f; } BLI_INLINE int BLI_rcti_cent_x(const struct rcti *rct) { return (rct->xmin + rct->xmax) / 2; } BLI_INLINE int BLI_rcti_cent_y(const struct rcti *rct) { return (rct->ymin + rct->ymax) / 2; } -BLI_INLINE int BLI_rctf_cent_x(const struct rctf *rct) { return (rct->xmin + rct->xmax) / 2.0f; } -BLI_INLINE int BLI_rctf_cent_y(const struct rctf *rct) { return (rct->ymin + rct->ymax) / 2.0f; } +BLI_INLINE float BLI_rctf_cent_x(const struct rctf *rct) { return (rct->xmin + rct->xmax) / 2.0f; } +BLI_INLINE float BLI_rctf_cent_y(const struct rctf *rct) { return (rct->ymin + rct->ymax) / 2.0f; } BLI_INLINE int BLI_rcti_size_x(const struct rcti *rct) { return (rct->xmax - rct->xmin); } BLI_INLINE int BLI_rcti_size_y(const struct rcti *rct) { return (rct->ymax - rct->ymin); } diff --git a/source/blender/compositor/intern/COM_NodeBase.h b/source/blender/compositor/intern/COM_NodeBase.h index b55e444be80..64d669b5e9a 100644 --- a/source/blender/compositor/intern/COM_NodeBase.h +++ b/source/blender/compositor/intern/COM_NodeBase.h @@ -97,7 +97,7 @@ public: * @return [true:false] * @see NodeOperation */ - virtual const int isOperation() const { return false; } + virtual const bool isOperation() const { return false; } /** * @brief check if this is an input node diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 93a19529d34..dfa22a29e41 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -88,7 +88,7 @@ public: * @return [true:false] * @see NodeBase */ - const int isOperation() const { return true; } + const bool isOperation() const { return true; } /** * @brief determine the resolution of this node diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 1d4fbe81e02..3d15f349f9b 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -148,7 +148,7 @@ struct BMFace *EDBM_face_find_nearest(struct ViewContext *vc, int *dist); int EDBM_select_pick(struct bContext *C, const int mval[2], short extend, short deselect, short toggle); void EDBM_selectmode_set(struct BMEditMesh *em); -void EDBM_selectmode_convert(struct BMEditMesh *em, short oldmode, const short selectmode); +void EDBM_selectmode_convert(struct BMEditMesh *em, short selectmode_old, const short selectmode_new); void EDBM_deselect_by_material(struct BMEditMesh *em, const short index, const short select); diff --git a/source/blender/editors/mesh/editmesh_bvh.c b/source/blender/editors/mesh/editmesh_bvh.c index 0b7d396b696..c249d764ac1 100644 --- a/source/blender/editors/mesh/editmesh_bvh.c +++ b/source/blender/editors/mesh/editmesh_bvh.c @@ -309,7 +309,7 @@ static void vertsearchcallback(void *userdata, int index, const float *UNUSED(co } } -BMVert *BMBVH_FindClosestVert(BMBVHTree *tree, const float co[3], float maxdist) +BMVert *BMBVH_FindClosestVert(BMBVHTree *tree, const float co[3], const float maxdist) { BVHTreeNearest hit; @@ -325,7 +325,7 @@ BMVert *BMBVH_FindClosestVert(BMBVHTree *tree, const float co[3], float maxdist) float dist, curdist = tree->maxdist, v[3]; int cur = 0, i; - maxdist = tree->maxdist; + /* maxdist = tree->maxdist; */ /* UNUSED */ for (i = 0; i < 3; i++) { sub_v3_v3v3(v, hit.co, ls[i]->v->co); |