asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #84914 from mihe/revert-84856

Browse source 
Revert "Fix transform notification not getting sent out for RigidBody2D"
This commit is contained in:
Rémi Verschelde 2023-11-14 23:31:44 +01:00
commit d5217b68db
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scene/main/canvas_item.cpp
View file

@ -891,18 +891,22 @@ void CanvasItem::_notify_transform(CanvasItem *p_node) {
* notification anyway). * notification anyway).
*/ */
if (p_node->block_transform_notify || p_node->_is_global_invalid()) { if (/*p_node->xform_change.in_list() &&*/ p_node->_is_global_invalid()) {
return; //nothing to do return; //nothing to do
} }
p_node->_set_global_invalid(true); p_node->_set_global_invalid(true);
if (p_node->notify_transform && !p_node->xform_change.in_list() && p_node->is_inside_tree()) { if (p_node->notify_transform && !p_node->xform_change.in_list()) {
if (is_accessible_from_caller_thread()) { if (!p_node->block_transform_notify) {
get_tree()->xform_change_list.add(&p_node->xform_change); if (p_node->is_inside_tree()) {
} else { if (is_accessible_from_caller_thread()) {
// Should be rare, but still needs to be handled. get_tree()->xform_change_list.add(&p_node->xform_change);
MessageQueue::get_singleton()->push_callable(callable_mp(p_node, &CanvasItem::_notify_transform_deferred)); } else {
// Should be rare, but still needs to be handled.
MessageQueue::get_singleton()->push_callable(callable_mp(p_node, &CanvasItem::_notify_transform_deferred));
}
}
} }
} }