diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-23 21:49:24 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-23 21:49:24 +0200 |
| commit | ab3716bd46d251dfb1c6664794e3b518c0d2218c (patch) | |
| tree | 40c9c6c0265e8ae52520e7835b52603269999bb6 /scene/main | |
| parent | b90dff787cb3696642fb2486f4ba02453d26fef7 (diff) | |
Revert "Take CanvasLayer transform into account for 2D physics"
This reverts commit 4839e5f6d9ed1c0afee933009ab44b9913310d27.
Fixes #21289.
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/canvas_layer.cpp | 19 | ||||
| -rw-r--r-- | scene/main/canvas_layer.h | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp index c044443b51..a2e890e7a7 100644 --- a/scene/main/canvas_layer.cpp +++ b/scene/main/canvas_layer.cpp @@ -29,7 +29,6 @@ /*************************************************************************/ #include "canvas_layer.h" -#include "scene/2d/canvas_item.h" #include "viewport.h" void CanvasLayer::set_layer(int p_xform) { @@ -63,24 +62,6 @@ void CanvasLayer::_update_xform() { transform.set_origin(ofs); if (viewport.is_valid()) VisualServer::get_singleton()->viewport_set_canvas_transform(viewport, canvas, transform); - - if (!is_inside_tree()) - return; - - _notify_xform(this); -} - -void CanvasLayer::_notify_xform(Node *p_node) { - - for (int i = 0; i < p_node->get_child_count(); i++) { - - CanvasItem *ci = Object::cast_to<CanvasItem>(p_node->get_child(i)); - if (ci) { - ci->_notify_transform(ci); - } else { - _notify_xform(p_node->get_child(i)); - } - } } void CanvasLayer::_update_locrotscale() { diff --git a/scene/main/canvas_layer.h b/scene/main/canvas_layer.h index fd347c4739..aae23fbb12 100644 --- a/scene/main/canvas_layer.h +++ b/scene/main/canvas_layer.h @@ -56,7 +56,6 @@ class CanvasLayer : public Node { int sort_index; void _update_xform(); - void _notify_xform(Node *p_node); void _update_locrotscale(); protected: |