noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Improve use of Ref.is_null/valid

Browse Source 
Use `is_null` over `!is_valid` and vice versa.
This commit is contained in:
A Thousand Ships
2024-08-25 14:15:10 +02:00
committed by AThousandShips
parent 0f95e9f8e6
commit a1846b27ea
177 changed files with 517 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/plugins/node_3d_editor_plugin.cpp
+12 -12
View File
@@ -823,7 +823,7 @@ ObjectID Node3DEditorViewport::_select_ray(const Point2 &p_pos) const {
for (int j = 0; j < gizmos.size(); j++) {
Ref<EditorNode3DGizmo> seg = gizmos[j];
if ((!seg.is_valid()) || found_gizmos.has(seg)) {
if (seg.is_null() || found_gizmos.has(seg)) {
continue;
}
@@ -887,7 +887,7 @@ void Node3DEditorViewport::_find_items_at_pos(const Point2 &p_pos, Vector<_RayRe
for (int j = 0; j < gizmos.size(); j++) {
Ref<EditorNode3DGizmo> seg = gizmos[j];
if (!seg.is_valid()) {
if (seg.is_null()) {
continue;
}
@@ -1004,7 +1004,7 @@ void Node3DEditorViewport::_select_region() {
Vector<Ref<Node3DGizmo>> gizmos = single_selected->get_gizmos();
for (int j = 0; j < gizmos.size(); j++) {
Ref<EditorNode3DGizmo> seg = gizmos[j];
if (!seg.is_valid()) {
if (seg.is_null()) {
continue;
}
@@ -1104,7 +1104,7 @@ void Node3DEditorViewport::_select_region() {
Vector<Ref<Node3DGizmo>> gizmos = sp->get_gizmos();
for (int j = 0; j < gizmos.size(); j++) {
Ref<EditorNode3DGizmo> seg = gizmos[j];
if (!seg.is_valid()) {
if (seg.is_null()) {
continue;
}
@@ -1851,7 +1851,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
for (int i = 0; i < gizmos.size(); i++) {
Ref<EditorNode3DGizmo> seg = gizmos[i];
if ((!seg.is_valid())) {
if (seg.is_null()) {
continue;
}
@@ -1888,7 +1888,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
for (int i = 0; i < gizmos.size(); i++) {
Ref<EditorNode3DGizmo> seg = gizmos[i];
if ((!seg.is_valid())) {
if (seg.is_null()) {
continue;
}
@@ -2054,7 +2054,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
for (int i = 0; i < gizmos.size(); i++) {
Ref<EditorNode3DGizmo> seg = gizmos[i];
if (!seg.is_valid()) {
if (seg.is_null()) {
continue;
}
@@ -2079,7 +2079,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
}
}
if (spatial_editor->get_current_hover_gizmo().is_null() && !m->get_button_mask().has_flag(MouseButtonMask::LEFT) && !_edit.gizmo.is_valid()) {
if (spatial_editor->get_current_hover_gizmo().is_null() && !m->get_button_mask().has_flag(MouseButtonMask::LEFT) && _edit.gizmo.is_null()) {
_transform_gizmo_select(_edit.mouse_pos, true);
}
@@ -4715,7 +4715,7 @@ bool Node3DEditorViewport::_create_instance(Node *p_parent, const String &p_path
instantiated_scene = mesh_instance;
} else {
if (!scene.is_valid()) { // invalid scene
if (scene.is_null()) { // invalid scene
return false;
} else {
instantiated_scene = scene->instantiate(PackedScene::GEN_EDIT_STATE_INSTANCE);
@@ -6600,7 +6600,7 @@ void Node3DEditor::edit(Node3D *p_spatial) {
Vector<Ref<Node3DGizmo>> gizmos = selected->get_gizmos();
for (int i = 0; i < gizmos.size(); i++) {
Ref<EditorNode3DGizmo> seg = gizmos[i];
if (!seg.is_valid()) {
if (seg.is_null()) {
continue;
}
seg->set_selected(false);
@@ -6624,7 +6624,7 @@ void Node3DEditor::edit(Node3D *p_spatial) {
Vector<Ref<Node3DGizmo>> gizmos = selected->get_gizmos();
for (int i = 0; i < gizmos.size(); i++) {
Ref<EditorNode3DGizmo> seg = gizmos[i];
if (!seg.is_valid()) {
if (seg.is_null()) {
continue;
}
seg->set_selected(true);
@@ -7831,7 +7831,7 @@ void Node3DEditor::_selection_changed() {
Vector<Ref<Node3DGizmo>> gizmos = selected->get_gizmos();
for (int i = 0; i < gizmos.size(); i++) {
Ref<EditorNode3DGizmo> seg = gizmos[i];
if (!seg.is_valid()) {
if (seg.is_null()) {
continue;
}
seg->set_selected(false);