diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mask_rasterize.c | 9 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/paint.c | 10 |
5 files changed, 13 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 712f79c40a7..a34b6803413 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1702,11 +1702,6 @@ static void cdDM_release(DerivedMesh *dm) } } -int CDDM_Check(DerivedMesh *dm) -{ - return dm && dm->getMinMax == cdDM_getMinMax; -} - /**************** CDDM interface functions ****************/ static CDDerivedMesh *cdDM_create(const char *desc) { diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index db4a639d91c..336656eed19 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1912,7 +1912,7 @@ void BKE_imbuf_stamp_info(Scene *scene, Object *camera, struct ImBuf *ibuf) if (stamp_data.rendertime[0]) IMB_metadata_change_field(ibuf, "RenderTime", stamp_data.rendertime); } -int BKE_imbuf_alpha_test(ImBuf *ibuf) +bool BKE_imbuf_alpha_test(ImBuf *ibuf) { int tot; if (ibuf->rect_float) { @@ -3025,7 +3025,7 @@ static ImBuf *image_get_cached_ibuf(Image *ima, ImageUser *iuser, int *frame_r, return ibuf; } -BLI_INLINE int image_quick_test(Image *ima, ImageUser *iuser) +BLI_INLINE bool image_quick_test(Image *ima, ImageUser *iuser) { if (ima == NULL) return FALSE; diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index 546c3f9e94b..3ecca00e31b 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -324,10 +324,11 @@ static void maskrasterize_spline_differentiate_point_outset(float (*diff_feather * - if not get the max radius to a corner of the bucket and see how close we * are to any of the triangle edges. */ -static int layer_bucket_isect_test(MaskRasterLayer *layer, unsigned int face_index, - const unsigned int bucket_x, const unsigned int bucket_y, - const float bucket_size_x, const float bucket_size_y, - const float bucket_max_rad_squared) +static bool layer_bucket_isect_test( + MaskRasterLayer *layer, unsigned int face_index, + const unsigned int bucket_x, const unsigned int bucket_y, + const float bucket_size_x, const float bucket_size_y, + const float bucket_max_rad_squared) { unsigned int *face = layer->face_array[face_index]; float (*cos)[3] = layer->face_coords; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 7329fe60d0f..6359c133886 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3504,7 +3504,7 @@ static Object *obrel_armature_find(Object *ob) return ob_arm; } -static int obrel_list_test(Object *ob) +static bool obrel_list_test(Object *ob) { return ob && !(ob->id.flag & LIB_DOIT); } diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 6bdfb22dc1a..690217a0779 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -265,7 +265,7 @@ void BKE_paint_brush_set(Paint *p, Brush *br) } /* are we in vertex paint or weight pain face select mode? */ -int paint_facesel_test(Object *ob) +bool paint_facesel_test(Object *ob) { return ( (ob != NULL) && (ob->type == OB_MESH) && @@ -276,7 +276,7 @@ int paint_facesel_test(Object *ob) } /* are we in weight paint vertex select mode? */ -int paint_vertsel_test(Object *ob) +bool paint_vertsel_test(Object *ob) { return ( (ob != NULL) && (ob->type == OB_MESH) && @@ -319,7 +319,7 @@ void BKE_paint_copy(Paint *src, Paint *tar) /* returns non-zero if any of the face's vertices * are hidden, zero otherwise */ -int paint_is_face_hidden(const MFace *f, const MVert *mvert) +bool paint_is_face_hidden(const MFace *f, const MVert *mvert) { return ((mvert[f->v1].flag & ME_HIDE) || (mvert[f->v2].flag & ME_HIDE) || @@ -330,7 +330,7 @@ int paint_is_face_hidden(const MFace *f, const MVert *mvert) /* returns non-zero if any of the corners of the grid * face whose inner corner is at (x, y) are hidden, * zero otherwise */ -int paint_is_grid_face_hidden(const unsigned int *grid_hidden, +bool paint_is_grid_face_hidden(const unsigned int *grid_hidden, int gridsize, int x, int y) { /* skip face if any of its corners are hidden */ @@ -341,7 +341,7 @@ int paint_is_grid_face_hidden(const unsigned int *grid_hidden, } /* Return TRUE if all vertices in the face are visible, FALSE otherwise */ -int paint_is_bmesh_face_hidden(BMFace *f) +bool paint_is_bmesh_face_hidden(BMFace *f) { BMLoop *l_iter; BMLoop *l_first; |