Skip to content

Commit 7f317ef

Browse files
committed
Remove CanvasItem::_invalidate_global_transform
The only use of that function can be replaced by `_notify_transform`, which makes the `propagate_call` unnecessary. As far as I can tell, the `data.blocked`-checks of `propagate_call` are not needed in this case, because `_invalidate_global_transform` causes no user-noticeable changes.
1 parent d2f76e8 commit 7f317ef

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

scene/main/canvas_item.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,6 @@ void CanvasItem::_redraw_callback() {
147147
pending_update = false; // don't change to false until finished drawing (avoid recursive update)
148148
}
149149

150-
void CanvasItem::_invalidate_global_transform() {
151-
_set_global_invalid(true);
152-
}
153-
154150
Transform2D CanvasItem::get_global_transform_with_canvas() const {
155151
ERR_READ_THREAD_GUARD_V(Transform2D());
156152
if (canvas_layer) {
@@ -449,7 +445,7 @@ void CanvasItem::set_as_top_level(bool p_top_level) {
449445

450446
if (!is_inside_tree()) {
451447
top_level = p_top_level;
452-
propagate_call(SNAME("_invalidate_global_transform"));
448+
_notify_transform();
453449
return;
454450
}
455451

@@ -1067,7 +1063,6 @@ void CanvasItem::_validate_property(PropertyInfo &p_property) const {
10671063

10681064
void CanvasItem::_bind_methods() {
10691065
ClassDB::bind_method(D_METHOD("_top_level_raise_self"), &CanvasItem::_top_level_raise_self);
1070-
ClassDB::bind_method(D_METHOD("_invalidate_global_transform"), &CanvasItem::_invalidate_global_transform);
10711066

10721067
#ifdef TOOLS_ENABLED
10731068
ClassDB::bind_method(D_METHOD("_edit_set_state", "state"), &CanvasItem::_edit_set_state);

scene/main/canvas_item.h

-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ class CanvasItem : public Node {
132132
virtual void _top_level_changed_on_parent();
133133

134134
void _redraw_callback();
135-
void _invalidate_global_transform();
136135

137136
void _enter_canvas();
138137
void _exit_canvas();

0 commit comments

Comments
 (0)