[Bf-blender-cvs] [bd15efefd2f] master: Cleanup: clang tidy

Jacques Lucke noreply at git.blender.org
Mon Oct 19 11:35:38 CEST 2020


Commit: bd15efefd2f2d3554364303a09b67198e39d7bcd
Author: Jacques Lucke
Date:   Mon Oct 19 11:34:26 2020 +0200
Branches: master
https://developer.blender.org/rBbd15efefd2f2d3554364303a09b67198e39d7bcd

Cleanup: clang tidy

===================================================================

M	source/blender/bmesh/tools/bmesh_bevel.c

===================================================================

diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index f45457085dc..3b32298426a 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -7196,11 +7196,9 @@ static float geometry_collide_offset(BevelParams *bp, EdgeHalf *eb)
       if (bp->offset_type == BEVEL_AMT_PERCENT) {
         return bp->offset > 50.0f ? 50.0f : 100.f;
       }
-      else {
-        /* This is only right sometimes. The exact answer is very hard to calculate. */
-        float blen = BM_edge_calc_length(eb->e);
-        return bp->offset > blen / 2.0f ? blen / 2.0f : blen;
-      }
+      /* This is only right sometimes. The exact answer is very hard to calculate. */
+      float blen = BM_edge_calc_length(eb->e);
+      return bp->offset > blen / 2.0f ? blen / 2.0f : blen;
     }
     return no_collide_offset;
   }



More information about the Bf-blender-cvs mailing list