summaryrefslogtreecommitdiffstats
path: root/editor/plugins/path_editor_plugin.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-09-04 11:30:04 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-09-04 11:32:56 +0200
commit5fe01d4cfc6a915d24bcb8cdc32ab371c01e94c6 (patch)
tree4dac370d3a60b5e94e06e8a555e176eb5443334c /editor/plugins/path_editor_plugin.cpp
parent1ebfd918d4b56a53ff1223cdf1912aa89863bb8b (diff)
downloadredot-engine-5fe01d4cfc6a915d24bcb8cdc32ab371c01e94c6.tar.gz
Move ParticlesMaterial code to its own resource file
It's shared by both 2D and 3D particles (+ CPU ones), so it makes sense to have as a common resource. It also allowed to disable compilation of Particles (3D) when using 'disable_3d'. Also cleaned up includes in SpatialEditorGizmos and some other places, as well as dropped dead code in material_editor_plugin.cpp.
Diffstat (limited to 'editor/plugins/path_editor_plugin.cpp')
-rw-r--r--editor/plugins/path_editor_plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/path_editor_plugin.cpp b/editor/plugins/path_editor_plugin.cpp
index ef7ecb0fb0..d74cd11cbc 100644
--- a/editor/plugins/path_editor_plugin.cpp
+++ b/editor/plugins/path_editor_plugin.cpp
@@ -30,7 +30,7 @@
#include "path_editor_plugin.h"
-#include "os/keyboard.h"
+#include "core/os/keyboard.h"
#include "scene/resources/curve.h"
#include "spatial_editor_plugin.h"