diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-20 21:10:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-20 21:10:10 +0200 |
| commit | 5c66771e3ebccdfec55bb94ea521d2f24cb6200a (patch) | |
| tree | 80bea3ee8792cb19e719221987faf1a2bf1e88a3 /modules/csg | |
| parent | 7b88ac08437d3bd062efcbdd40c215b533032412 (diff) | |
| parent | 072e40368e19e0f88ec1fbb61fe463a6fffcca36 (diff) | |
Merge pull request #29283 from qarmin/fix_some_always_same_values
Remove always true/false values
Diffstat (limited to 'modules/csg')
| -rw-r--r-- | modules/csg/csg.cpp | 8 | ||||
| -rw-r--r-- | modules/csg/csg_shape.cpp | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp index aa4d7d7d32..fd0d36eddf 100644 --- a/modules/csg/csg.cpp +++ b/modules/csg/csg.cpp @@ -1018,15 +1018,15 @@ int CSGBrushOperation::MeshMerge::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from max_depth = p_depth; } - if (p_size <= BVH_LIMIT) { + if (p_size == 0) { + + return -1; + } else if (p_size <= BVH_LIMIT) { for (int i = 0; i < p_size - 1; i++) { p_bb[p_from + i]->next = p_bb[p_from + i + 1] - p_bvh; } return p_bb[p_from] - p_bvh; - } else if (p_size == 0) { - - return -1; } AABB aabb; diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index 1d27b9b6f4..a496a214fd 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -1816,11 +1816,9 @@ CSGBrush *CSGPolygon::_build_brush() { path_cache = path; - if (path_cache) { - path_cache->connect("tree_exited", this, "_path_exited"); - path_cache->connect("curve_changed", this, "_path_changed"); - path_cache = NULL; - } + path_cache->connect("tree_exited", this, "_path_exited"); + path_cache->connect("curve_changed", this, "_path_changed"); + path_cache = NULL; } curve = path->get_curve(); if (curve.is_null()) |