godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-29 16:16:38 +00:00
Code Releases Wiki Activity

Merge pull request #21379 from volzhs/particle-mat

Browse Source 
Make ParticlesMaterial included with disable_3d=yes option
This commit is contained in:
Rémi Verschelde
2018-08-24 20:38:51 +02:00
committed by GitHub
parent f34690a162 0e7178a740
commit 9df480d68b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scene/register_scene_types.cpp
View File

@@ -563,6 +563,9 @@ void register_scene_types() {
/* REGISTER RESOURCES */ /* REGISTER RESOURCES */
ClassDB::register_virtual_class<Shader>(); ClassDB::register_virtual_class<Shader>();
ClassDB::register_class<ParticlesMaterial>();
SceneTree::add_idle_callback(ParticlesMaterial::flush_changes);
ParticlesMaterial::init_shaders();
#ifndef _3D_DISABLED #ifndef _3D_DISABLED
ClassDB::register_virtual_class<Mesh>(); ClassDB::register_virtual_class<Mesh>();
@@ -580,10 +583,6 @@ void register_scene_types() {
SceneTree::add_idle_callback(SpatialMaterial::flush_changes); SceneTree::add_idle_callback(SpatialMaterial::flush_changes);
SpatialMaterial::init_shaders(); SpatialMaterial::init_shaders();
ClassDB::register_class<ParticlesMaterial>();
SceneTree::add_idle_callback(ParticlesMaterial::flush_changes);
ParticlesMaterial::init_shaders();
ClassDB::register_class<MultiMesh>(); ClassDB::register_class<MultiMesh>();
ClassDB::register_class<MeshLibrary>(); ClassDB::register_class<MeshLibrary>();