Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Style: clang-format: Disable AllowShortIfStatementsOnASingleLine

Browse source
This commit is contained in:
Rémi Verschelde 2021-05-04 14:28:27 +02:00
parent 6e600cb3f0
commit 3d15f04668
No known key found for this signature in database
GPG key ID: C3336907360768E1
128 changed files with 872 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

15
editor/spatial_editor_gizmos.cpp
View file

@ -421,7 +421,8 @@ bool EditorSpatialGizmo::intersect_frustum(const Camera *p_camera, const Vector<
ERR_FAIL_COND_V(!spatial_node, false);
ERR_FAIL_COND_V(!valid, false);
if (hidden && !gizmo_plugin->is_selectable_when_hidden()) return false;
if (hidden && !gizmo_plugin->is_selectable_when_hidden())
return false;
if (selectable_icon_size > 0.0f) {
Vector3 origin = spatial_node->get_global_transform().get_origin();
@ -460,10 +461,12 @@ bool EditorSpatialGizmo::intersect_frustum(const Camera *p_camera, const Vector<
break;
}
}
if (any_out) break;
if (any_out)
break;
}
if (!any_out) return true;
if (!any_out)
return true;
}
if (collision_mesh.is_valid()) {
@ -495,7 +498,8 @@ bool EditorSpatialGizmo::intersect_ray(Camera *p_camera, const Point2 &p_point,
ERR_FAIL_COND_V(!spatial_node, false);
ERR_FAIL_COND_V(!valid, false);
if (hidden && !gizmo_plugin->is_selectable_when_hidden()) return false;
if (hidden && !gizmo_plugin->is_selectable_when_hidden())
return false;
if (r_gizmo_handle && !hidden) {
@ -776,7 +780,8 @@ EditorSpatialGizmo::EditorSpatialGizmo() {
EditorSpatialGizmo::~EditorSpatialGizmo() {
if (gizmo_plugin != NULL) gizmo_plugin->unregister_gizmo(this);
if (gizmo_plugin != NULL)
gizmo_plugin->unregister_gizmo(this);
clear();
}