Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Move ParticlesMaterial code to its own resource file

Browse source 
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.
This commit is contained in:
Rémi Verschelde 2018-09-04 11:30:04 +02:00
parent 1ebfd918d4
commit 5fe01d4cfc
22 changed files with 1606 additions and 2001 deletions
Download patch file Download diff file Expand all files Collapse all files

3
editor/plugins/particles_editor_plugin.cpp
View file

@ -29,9 +29,12 @@
/*************************************************************************/
#include "particles_editor_plugin.h"
#include "editor/plugins/spatial_editor_plugin.h"
#include "io/resource_loader.h"
#include "scene/3d/cpu_particles.h"
#include "scene/resources/particles_material.h"
bool ParticlesEditorBase::_generate(PoolVector<Vector3> &points, PoolVector<Vector3> &normals) {
bool use_normals = emission_fill->get_selected() == 1;