Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-08-08 04:02:11 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-08-08 06:37:55 +0300
commit586a3084677b03e314a906ffdac3560a24058409 (patch)
treeb2b920b14e5408b09556c514814e82a188a1d38d /source/blender/blenkernel
parentf1b1a0745f53564ed8eedd90d2de41cdf1d72836 (diff)
Cleanup: remove redundant return parenthesis
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/image.c4
-rw-r--r--source/blender/blenkernel/intern/packedFile.c20
-rw-r--r--source/blender/blenkernel/intern/softbody.c10
3 files changed, 17 insertions, 17 deletions
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 */