diff options
author | Hans Goudey <h.goudey@me.com> | 2020-07-03 16:41:55 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-07-03 16:41:55 +0300 |
commit | 19ff145e666633cebeae97cf985c968d39044215 (patch) | |
tree | 0d1d52925a870127fbb4fbd2d512338dcf358c33 /source | |
parent | ffef562bf7792081c252118b22218647170117cf (diff) |
Clang-Tidy: Enable readability-redundant-control-flow
Diffstat (limited to 'source')
17 files changed, 0 insertions, 28 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index d4de04a9e98..0e2d8fcf4c7 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1272,8 +1272,6 @@ void BKE_texpaint_slot_refresh_cache(Scene *scene, Material *ma) if (ma->paint_clone_slot >= count) { ma->paint_clone_slot = count - 1; } - - return; } void BKE_texpaint_slots_refresh_object(Scene *scene, struct Object *ob) diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 9c7abbdf876..75da92a26b8 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -481,7 +481,6 @@ static void ccd_mesh_update(Object *ob, ccd_Mesh *pccd_M) mima->maxy = max_ff(mima->maxy, v[1] + hull); mima->maxz = max_ff(mima->maxz, v[2] + hull); } - return; } static void ccd_mesh_free(ccd_Mesh *ccdm) diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 8455b60c894..46341652544 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -875,7 +875,6 @@ BLI_INLINE void studiolight_spherical_harmonics_eval(StudioLight *sl, color[i] = studiolight_spherical_harmonics_geomerics_eval( normal, sh[0][i], sh[1][i], sh[2][i], sh[3][i]); } - return; #else /* L0 */ mul_v3_v3fl(color, sl->spherical_harmonics_coefs[0], 0.282095f); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 5a2b8da6ef9..4d411225be3 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4908,7 +4908,6 @@ static void direct_link_particlesystems(BlendDataReader *reader, ListBase *parti psys->orig_psys = NULL; psys->batch_cache = NULL; } - return; } /** \} */ diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp index ee1bb0739b9..56caa68fd35 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp @@ -138,7 +138,6 @@ void VectorBlurOperation::generateVectorBlur(float *data, inputImage->getBuffer(), inputSpeed->getBuffer(), inputZ->getBuffer()); - return; } /* ****************** Spans ******************************* */ diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c index 53e04fb61ee..d648245f232 100644 --- a/source/blender/draw/intern/draw_cache_impl_gpencil.c +++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c @@ -150,7 +150,6 @@ void DRW_gpencil_batch_cache_free(bGPdata *gpd) gpencil_batch_cache_clear(gpd->runtime.gpencil_cache); MEM_SAFE_FREE(gpd->runtime.gpencil_cache); gpd->flag |= GP_DATA_CACHE_IS_DIRTY; - return; } /** \} */ diff --git a/source/blender/editors/gpencil/gpencil_vertex_paint.c b/source/blender/editors/gpencil/gpencil_vertex_paint.c index 99d55350527..5f8ff228d4d 100644 --- a/source/blender/editors/gpencil/gpencil_vertex_paint.c +++ b/source/blender/editors/gpencil/gpencil_vertex_paint.c @@ -408,8 +408,6 @@ static void gpencil_grid_colors_calc(tGP_BrushVertexpaintData *gso) round_v2i_v2fl(gso->grid_sample, gso->mval); gso->grid_ready = true; - - return; } /* ************************************************ */ diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 7ca2a89f61d..29143ae10f3 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -4119,8 +4119,6 @@ static void vgroup_sort_bone_hierarchy(Object *ob, ListBase *bonebase) } } } - - return; } enum { diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index dfb8f03fa6e..a15d7a732f1 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -5906,8 +5906,6 @@ static void project_state_init(bContext *C, Object *ob, ProjPaintState *ps, int ps->dither = settings->imapaint.dither; ps->use_colormanagement = BKE_scene_check_color_management_enabled(CTX_data_scene(C)); - - return; } void *paint_proj_new_stroke(bContext *C, Object *ob, const float mouse[2], int mode) diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.c b/source/blender/editors/sculpt_paint/sculpt_cloth.c index 58f9cdbc867..195e6512291 100644 --- a/source/blender/editors/sculpt_paint/sculpt_cloth.c +++ b/source/blender/editors/sculpt_paint/sculpt_cloth.c @@ -671,8 +671,6 @@ void SCULPT_do_cloth_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode /* Update and write the simulation to the nodes. */ cloth_brush_do_simulation_step(sd, ob, ss->cache->cloth_sim, nodes, totnode); - - return; } void SCULPT_cloth_simulation_free(struct SculptClothSimulation *cloth_sim) diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index d6b259c9ac0..4b3df2dfea2 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -228,8 +228,6 @@ static void HC_relaxation_iteration_uv(BMEditMesh *em, } MEM_freeN(tmp_uvdata); - - return; } static void laplacian_relaxation_iteration_uv(BMEditMesh *em, @@ -302,8 +300,6 @@ static void laplacian_relaxation_iteration_uv(BMEditMesh *em, } MEM_freeN(tmp_uvdata); - - return; } static void uv_sculpt_stroke_apply(bContext *C, diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c index 805e9608fec..7e3dbcfefa4 100644 --- a/source/blender/editors/space_console/console_draw.c +++ b/source/blender/editors/space_console/console_draw.c @@ -139,7 +139,6 @@ static void console_cursor_wrap_offset( *column += col; } - return; } static void console_textview_draw_cursor(TextViewContext *tvc, int cwidth, int columns) diff --git a/source/blender/freestyle/intern/geometry/matrix_util.cpp b/source/blender/freestyle/intern/geometry/matrix_util.cpp index 811b10813d1..9d25a240a63 100644 --- a/source/blender/freestyle/intern/geometry/matrix_util.cpp +++ b/source/blender/freestyle/intern/geometry/matrix_util.cpp @@ -248,7 +248,6 @@ void semi_definite_symmetric_eigen(const double *mat, int n, double *eigen_vec, delete[] v; delete[] index; - return; } //_________________________________________________________ diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index 711147a61e9..669b073232d 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -282,8 +282,6 @@ static void gpu_shader_standard_defines(char defines[MAX_DEFINE_LENGTH]) else { strcat(defines, "#define DFDY_SIGN -1.0\n"); } - - return; } GPUShader *GPU_shader_create(const char *vertexcode, diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp index 0e211f08d1f..1e637f333e9 100644 --- a/source/blender/io/collada/AnimationImporter.cpp +++ b/source/blender/io/collada/AnimationImporter.cpp @@ -967,8 +967,6 @@ void AnimationImporter::apply_matrix_curves(Object *ob, else { ob->rotmode = ROT_MODE_QUAT; } - - return; } /* diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c index 50ae05694eb..9b191ee5698 100644 --- a/source/blender/python/intern/bpy_driver.c +++ b/source/blender/python/intern/bpy_driver.c @@ -237,8 +237,6 @@ void BPY_driver_reset(void) if (use_gil) { PyGILState_Release(gilstate); } - - return; } /* error return function for BPY_eval_pydriver */ diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 948e8d9fb74..37c7e802554 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -542,7 +542,6 @@ static void build_pict_list_ex( totframes--; } } - return; } static void build_pict_list(PlayState *ps, const char *first, int totframes, int fstep, int fontid) |