diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-24 22:45:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 22:45:24 +0200 |
| commit | 62f2a8aadb28572f6d6a1fd382312e788fada3bc (patch) | |
| tree | a016bf5b03e690e4358bd3a6b1bc24bfda937c8c | |
| parent | d1624cca990637a571f56cbcb2f512c0d0d28e20 (diff) | |
| parent | 49d0af3c8ef1f7add1aec66f66acbbe0c969677b (diff) | |
Merge pull request #20252 from RandomShaper/fix-canvas-search
Fix CanvasItem's search for a CanvasLayer
| -rw-r--r-- | scene/2d/canvas_item.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 47326b9be2..a035d9021f 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -411,6 +411,9 @@ void CanvasItem::_enter_canvas() { if (canvas_layer) { break; } + if (Object::cast_to<Viewport>(n)) { + break; + } n = n->get_parent(); } |