godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #103845 from aaronfranke/fix-ed-stuck-cam-nonfin-xform

Browse Source 
Fix stuck editor cameras and fix 3D error spam for non-finite transforms
This commit is contained in:
Thaddeus Crews
2025-03-13 08:57:25 -05:00
parent 6ffe44d322 c7649f4f9c
commit 4e9b7976ce
2 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -4882,31 +4882,30 @@ void CanvasItemEditor::_focus_selection(int p_op) {
if (!ci) {
continue;
}
// counting invisible items, for now
//if (!ci->is_visible_in_tree()) continue;
++count;
const Transform2D canvas_item_transform = ci->get_global_transform();
if (!canvas_item_transform.is_finite()) {
continue;
}
Rect2 item_rect;
if (ci->_edit_use_rect()) {
item_rect = ci->_edit_get_rect();
} else {
item_rect = Rect2();
}
Vector2 pos = ci->get_global_transform().get_origin();
Vector2 scale = ci->get_global_transform().get_scale();
real_t angle = ci->get_global_transform().get_rotation();
Vector2 pos = canvas_item_transform.get_origin();
const Vector2 scale = canvas_item_transform.get_scale();
const real_t angle = canvas_item_transform.get_rotation();
pos = ci->get_viewport()->get_popup_base_transform().xform(pos);
Transform2D t(angle, Vector2(0.f, 0.f));
item_rect = t.xform(item_rect);
Rect2 canvas_item_rect(pos + scale * item_rect.position, scale * item_rect.size);
if (count == 1) {
if (count == 0) {
rect = canvas_item_rect;
} else {
rect = rect.merge(canvas_item_rect);
}
count++;
}
if (p_op == VIEW_FRAME_TO_SELECTION && rect.size.x > CMP_EPSILON && rect.size.y > CMP_EPSILON) {