godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

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

2
editor/plugins/particles_2d_editor_plugin.cpp
View File

@@ -32,8 +32,8 @@
#include "canvas_item_editor_plugin.h"
#include "io/image_loader.h"
#include "scene/3d/particles.h"
#include "scene/gui/separator.h"
#include "scene/resources/particles_material.h"
void Particles2DEditorPlugin::edit(Object *p_object) {