diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2021-09-13 03:02:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 03:02:11 +0200 |
| commit | a53ce5b851233aa0752bea46791c445fd8839611 (patch) | |
| tree | 543c909358aafce17b13e4813ada72c9da896157 | |
| parent | 9d4c84e1548edad3aa66fb11c8e948295e7b656e (diff) | |
| parent | 6b68445e4d83684fe79ebfb5d5cbfc03a87153c7 (diff) | |
Merge pull request #52612 from KoBeWi/this_branch_name_is_longer_than_code_diff_lol
Fix multiple definitions of Listener2D
| -rw-r--r-- | scene/main/viewport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index a352953c4b..eea5ca9895 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -37,7 +37,7 @@ #include "core/templates/pair.h" #include "scene/2d/camera_2d.h" #include "scene/2d/collision_object_2d.h" -#include "scene/2d/listener_2d.cpp" +#include "scene/2d/listener_2d.h" #ifndef _3D_DISABLED #include "scene/3d/camera_3d.h" #include "scene/3d/collision_object_3d.h" |