[Bf-blender-cvs] [0a6ef695095] newboolean: Cleanup: move break statements into case body, or remove if follwing a return.
Howard Trickey
noreply at git.blender.org
Fri Aug 21 16:17:30 CEST 2020
Commit: 0a6ef6950959ae0e86a5a7ff12262e78eb852a9f
Author: Howard Trickey
Date: Fri Aug 21 10:16:37 2020 -0400
Branches: newboolean
https://developer.blender.org/rB0a6ef6950959ae0e86a5a7ff12262e78eb852a9f
Cleanup: move break statements into case body, or remove if follwing a return.
===================================================================
M source/blender/blenlib/intern/mesh_boolean.cc
M source/blender/blenlib/intern/mesh_intersect.cc
===================================================================
diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc
index 4a9bf28ac78..0095ec95140 100644
--- a/source/blender/blenlib/intern/mesh_boolean.cc
+++ b/source/blender/blenlib/intern/mesh_boolean.cc
@@ -2015,7 +2015,7 @@ static bool apply_bool_op(int bool_optype, const Array<int> &winding)
}
}
return true;
- } break;
+ }
case BOOLEAN_UNION: {
for (int i = 0; i < nw; ++i) {
if (winding[i] != 0) {
@@ -2023,7 +2023,7 @@ static bool apply_bool_op(int bool_optype, const Array<int> &winding)
}
}
return false;
- } break;
+ }
case BOOLEAN_DIFFERENCE: {
/* if nw > 2, make it shape 0 minus the union of the rest. */
if (winding[0] == 0) {
@@ -2038,7 +2038,7 @@ static bool apply_bool_op(int bool_optype, const Array<int> &winding)
}
}
return false;
- } break;
+ }
default:
return false;
}
@@ -2229,13 +2229,10 @@ static const char *bool_optype_name(bool_optype op)
switch (op) {
case BOOLEAN_NONE:
return "none";
- break;
case BOOLEAN_ISECT:
return "intersect";
- break;
case BOOLEAN_UNION:
return "union";
- break;
case BOOLEAN_DIFFERENCE:
return "difference";
default:
@@ -2395,6 +2392,8 @@ static IMesh gwn_boolean(const IMesh &tm,
do_flip = (shape == 1);
break;
default:
+ do_remove = false;
+ do_flip = false;
BLI_assert(false);
}
if (dbg_level > 0) {
diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc
index 50f7bb2a4ca..38b17b7100e 100644
--- a/source/blender/blenlib/intern/mesh_intersect.cc
+++ b/source/blender/blenlib/intern/mesh_intersect.cc
@@ -1068,15 +1068,18 @@ static mpq2 project_3d_to_2d(const mpq3 &p3d, int proj_axis)
case (0): {
p2d[0] = p3d[1];
p2d[1] = p3d[2];
- } break;
+ break;
+ }
case (1): {
p2d[0] = p3d[0];
p2d[1] = p3d[2];
- } break;
+ break;
+ }
case (2): {
p2d[0] = p3d[0];
p2d[1] = p3d[1];
- } break;
+ break;
+ }
default:
BLI_assert(false);
}
@@ -2032,21 +2035,24 @@ static mpq3 unproject_cdt_vert(const CDT_data &cd, const mpq2 &p2d)
p3d[0] = num / n[0];
p3d[1] = p2d[0];
p3d[2] = p2d[1];
- } break;
+ break;
+ }
case (1): {
p3d[0] = p2d[0];
mpq_class num = n[0] * p2d[0] + n[2] * p2d[1] + d;
num = -num;
p3d[1] = num / n[1];
p3d[2] = p2d[1];
- } break;
+ break;
+ }
case (2): {
p3d[0] = p2d[0];
p3d[1] = p2d[1];
mpq_class num = n[0] * p2d[0] + n[1] * p2d[1] + d;
num = -num;
p3d[2] = num / n[2];
- } break;
+ break;
+ }
default:
BLI_assert(false);
}
@@ -2107,13 +2113,16 @@ static CDT_data prepare_cdt_input(const IMesh &tm, int t, const Vector<ITT_value
break;
case IPOINT: {
prepare_need_vert(ans, itt.p1);
- } break;
+ break;
+ }
case ISEGMENT: {
prepare_need_edge(ans, itt.p1, itt.p2);
- } break;
+ break;
+ }
case ICOPLANAR: {
prepare_need_tri(ans, tm, itt.t_source);
- } break;
+ break;
+ }
}
}
return ans;
@@ -2139,10 +2148,12 @@ static CDT_data prepare_cdt_input_for_cluster(const IMesh &tm,
switch (itt.kind) {
case IPOINT: {
prepare_need_vert(ans, itt.p1);
- } break;
+ break;
+ }
case ISEGMENT: {
prepare_need_edge(ans, itt.p1, itt.p2);
- } break;
+ break;
+ }
default:
break;
}
More information about the Bf-blender-cvs
mailing list