From 586a3084677b03e314a906ffdac3560a24058409 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 8 Aug 2020 11:02:11 +1000 Subject: Cleanup: remove redundant return parenthesis --- source/blender/blenkernel/intern/image.c | 4 ++-- source/blender/blenkernel/intern/packedFile.c | 20 ++++++++++---------- source/blender/blenkernel/intern/softbody.c | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 4bd966cffc6..7ff34acca7a 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2877,7 +2877,7 @@ int BKE_imbuf_write(ImBuf *ibuf, const char *name, const ImageFormatData *imf) perror(name); } - return (ok); + return ok; } /* same as BKE_imbuf_write() but crappy workaround not to permanently modify @@ -3005,7 +3005,7 @@ struct anim *openanim(const char *name, int flags, int streamindex, char colorsp } IMB_freeImBuf(ibuf); - return (anim); + return anim; } /* ************************* New Image API *************** */ diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 918cb8893ac..6793f5e1169 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -80,7 +80,7 @@ int BKE_packedfile_seek(PackedFile *pf, int offset, int whence) pf->seek = seek; } - return (oldseek); + return oldseek; } void BKE_packedfile_rewind(PackedFile *pf) @@ -108,7 +108,7 @@ int BKE_packedfile_read(PackedFile *pf, void *data, int size) size = -1; } - return (size); + return size; } int BKE_packedfile_count_all(Main *bmain) @@ -234,7 +234,7 @@ PackedFile *BKE_packedfile_new(ReportList *reports, const char *filename, const // XXX waitcursor(0); - return (pf); + return pf; } /* no libraries for now */ @@ -365,7 +365,7 @@ int BKE_packedfile_write_to_file(ReportList *reports, if (guimode) { } // XXX waitcursor(0); - return (ret_value); + return ret_value; } /** @@ -426,7 +426,7 @@ enum ePF_FileCompare BKE_packedfile_compare_to_file(const char *ref_file_name, } } - return (ret_val); + return ret_val; } /** @@ -579,7 +579,7 @@ int BKE_packedfile_unpack_vfont(Main *bmain, } } - return (ret_value); + return ret_value; } int BKE_packedfile_unpack_sound(Main *bmain, @@ -609,7 +609,7 @@ int BKE_packedfile_unpack_sound(Main *bmain, } } - return (ret_value); + return ret_value; } int BKE_packedfile_unpack_image(Main *bmain, @@ -662,7 +662,7 @@ int BKE_packedfile_unpack_image(Main *bmain, BKE_image_signal(bmain, ima, NULL, IMA_SIGNAL_RELOAD); } - return (ret_value); + return ret_value; } int BKE_packedfile_unpack_volume(Main *bmain, @@ -692,7 +692,7 @@ int BKE_packedfile_unpack_volume(Main *bmain, } } - return (ret_value); + return ret_value; } int BKE_packedfile_unpack_all_libraries(Main *bmain, ReportList *reports) @@ -723,7 +723,7 @@ int BKE_packedfile_unpack_all_libraries(Main *bmain, ReportList *reports) } } - return (ret_value); + return ret_value; } void BKE_packedfile_pack_all_libraries(Main *bmain, ReportList *reports) diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 1d56db3779a..d38b70a33c8 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -230,7 +230,7 @@ static float _final_goal(Object *ob, BodyPoint *bp) /*jow_go_for2_5 */ } f = sb->mingoal + bp->goal * fabsf(sb->maxgoal - sb->mingoal); f = pow(f, 4.0f); - return (f); + return f; } } CLOG_ERROR(&LOG, "sb or bp == NULL"); @@ -1619,7 +1619,7 @@ static int choose_winner( case 3: copy_v3_v3(w, cc); } - return (winner); + return winner; } static int sb_detect_vertex_collisionCached(float opco[3], @@ -1833,7 +1833,7 @@ static int sb_deflect_face(Object *ob, deflected = sb_detect_vertex_collisionCachedEx( s_actpos, facenormal, cf, force, ob, time, vel, intrusion); #endif - return (deflected); + return deflected; } /* hiding this for now .. but the jacobian may pop up on other tasks .. so i'd like to keep it */ @@ -1991,13 +1991,13 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, } else { CLOG_ERROR(&LOG, "expected a SB here"); - return (999); + return 999; } /* debugerin */ if (sb->totpoint < ifirst) { printf("Aye 998"); - return (998); + return 998; } /* debugerin */ -- cgit v1.2.3