diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-03-27 13:47:15 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 13:47:15 -0300 |
| commit | 307b1b3a5835ecdb477859785c673a07e248f904 (patch) | |
| tree | cc0123bc7111e48775331d500452875c278cc13b /scene/gui | |
| parent | f48aeeeeefa73d4c6e58ee2934eaf16bc0408df0 (diff) | |
| parent | d1acbbce7f123c2b5fccdefc6417787dc91b6ced (diff) | |
Merge pull request #37340 from reduz/rename-3d-nodes
Make 2D and 3D node names more explicit
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/control.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/control.h b/scene/gui/control.h index c52e80fa70..d02fea20a6 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -33,8 +33,8 @@ #include "core/math/transform_2d.h" #include "core/rid.h" -#include "scene/2d/canvas_item.h" #include "scene/gui/shortcut.h" +#include "scene/main/canvas_item.h" #include "scene/main/node.h" #include "scene/main/timer.h" #include "scene/resources/theme.h" |