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/main/scene_tree.h | |
| 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/main/scene_tree.h')
| -rw-r--r-- | scene/main/scene_tree.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h index e6b2575f98..319b5a7e74 100644 --- a/scene/main/scene_tree.h +++ b/scene/main/scene_tree.h @@ -36,8 +36,8 @@ #include "core/os/thread_safe.h" #include "core/self_list.h" #include "scene/resources/mesh.h" -#include "scene/resources/world.h" #include "scene/resources/world_2d.h" +#include "scene/resources/world_3d.h" #undef Window @@ -189,7 +189,7 @@ private: void _flush_delete_queue(); //optimization friend class CanvasItem; - friend class Spatial; + friend class Node3D; friend class Viewport; SelfList<Node>::List xform_change_list; |