godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Merge pull request #29283 from qarmin/fix_some_always_same_values

Browse Source 
Remove always true/false values
This commit is contained in:
Rémi Verschelde
2019-06-20 21:10:10 +02:00
committed by GitHub
parent 7b88ac0843 072e40368e
commit 5c66771e3e
32 changed files with 128 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/csg/csg.cpp
View File

@@ -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;