diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-04 11:30:04 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-04 11:32:56 +0200 |
| commit | 5fe01d4cfc6a915d24bcb8cdc32ab371c01e94c6 (patch) | |
| tree | 4dac370d3a60b5e94e06e8a555e176eb5443334c /scene/3d/cpu_particles.cpp | |
| parent | 1ebfd918d4b56a53ff1223cdf1912aa89863bb8b (diff) | |
| download | redot-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 'scene/3d/cpu_particles.cpp')
| -rw-r--r-- | scene/3d/cpu_particles.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scene/3d/cpu_particles.cpp b/scene/3d/cpu_particles.cpp index 3f76303ad3..712f0ba78b 100644 --- a/scene/3d/cpu_particles.cpp +++ b/scene/3d/cpu_particles.cpp @@ -30,10 +30,9 @@ #include "cpu_particles.h" -#include "particles.h" #include "scene/3d/camera.h" -#include "scene/main/viewport.h" -#include "scene/resources/surface_tool.h" +#include "scene/3d/particles.h" +#include "scene/resources/particles_material.h" #include "servers/visual_server.h" AABB CPUParticles::get_aabb() const { |