summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorMarcel Admiraal <madmiraal@users.noreply.github.com>2019-10-09 16:11:04 +0200
committerMarcel Admiraal <madmiraal@users.noreply.github.com>2019-10-10 08:57:00 +0200
commita8836ba28d09e2fa99693c09889a8bbba0e3a106 (patch)
tree14d53022d324e29869bbebd33078966c3f7a5b4f /scene/gui
parent781e4f8673857b2b318e919ecb780bfad972a5a6 (diff)
Remove dependency on the editor directory being in the build's include path.
- Add or remove the necessary subdirectorires to the includes to remove dependency on the editor directory being in the build's include path. - Ensure includes in modified files conform to style guideline. - Remove editor from the build include path.
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/color_picker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index ffe011e5f7..96b62b97f9 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -35,8 +35,8 @@
#include "core/os/os.h"
#ifdef TOOLS_ENABLED
-#include "editor_scale.h"
-#include "editor_settings.h"
+#include "editor/editor_scale.h"
+#include "editor/editor_settings.h"
#endif
#include "scene/main/viewport.h"