From 6f0f1dc3be9c88b8d54abce290acee1c948c248b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 19 Apr 2015 22:03:42 +1000 Subject: Cleanup: warnings --- source/blender/blenkernel/intern/camera.c | 3 ++- source/blender/blenkernel/intern/customdata.c | 4 ++-- source/blender/blenkernel/intern/image.c | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index d62628baa9e..87d81a9e921 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -728,7 +728,8 @@ static void camera_stereo3d_model_matrix(Object *camera, const bool is_left, flo if (((pivot == CAM_S3D_PIVOT_LEFT) && is_left) || ((pivot == CAM_S3D_PIVOT_RIGHT) && !is_left)) { - return camera_model_matrix(camera, r_modelmat); + camera_model_matrix(camera, r_modelmat); + return; } else { float size[3]; diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 999f411cece..add6bb0fd0b 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2294,7 +2294,7 @@ void CustomData_interp(const CustomData *source, CustomData *dest, } } - if (count > SOURCE_BUF_SIZE) MEM_freeN(sources); + if (count > SOURCE_BUF_SIZE) MEM_freeN((void *)sources); } void CustomData_swap(struct CustomData *data, int index, const int *corner_indices) @@ -3852,7 +3852,7 @@ void CustomData_data_transfer(const MeshPairRemap *me_remap, const CustomDataTra if (tmp_data_src) { if (UNLIKELY(sources_num > tmp_buff_size)) { tmp_buff_size = (size_t)sources_num; - tmp_data_src = MEM_reallocN(tmp_data_src, sizeof(*tmp_data_src) * tmp_buff_size); + tmp_data_src = MEM_reallocN((void *)tmp_data_src, sizeof(*tmp_data_src) * tmp_buff_size); } for (j = 0; j < sources_num; j++) { diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index bb9fdba94fa..a09c42e9178 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -960,8 +960,10 @@ void BKE_image_memorypack(Image *ima) { ImBuf *ibuf; - if ((ima->flag & IMA_IS_MULTIVIEW)) - return image_memorypack_multiview(ima); + if ((ima->flag & IMA_IS_MULTIVIEW)) { + image_memorypack_multiview(ima); + return; + } ibuf = image_get_cached_ibuf_for_index_frame(ima, IMA_NO_INDEX, 0); @@ -2494,7 +2496,7 @@ static void image_init_imageuser(Image *ima, ImageUser *iuser) void BKE_image_init_imageuser(Image *ima, ImageUser *iuser) { - return image_init_imageuser(ima, iuser); + image_init_imageuser(ima, iuser); } void BKE_image_signal(Image *ima, ImageUser *iuser, int signal) -- cgit v1.2.3