summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-08-24 20:38:51 +0200
committerGitHub <noreply@github.com>2018-08-24 20:38:51 +0200
commit9df480d68bc79bc22ff98d85220c1feffe98d23b (patch)
tree44869cb4f38f93aaf2abc3c8915d47fd06291c29 /scene
parentf34690a1625d1480582c65eca5b7acf869b3815d (diff)
parent0e7178a740f9ad23c5ce84fcdd0ff4713f9bc387 (diff)
Merge pull request #21379 from volzhs/particle-mat
Make ParticlesMaterial included with disable_3d=yes option
Diffstat (limited to 'scene')
-rw-r--r--scene/register_scene_types.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 3d837d4468..dccdd244ef 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -563,6 +563,9 @@ void register_scene_types() {
/* REGISTER RESOURCES */
ClassDB::register_virtual_class<Shader>();
+ ClassDB::register_class<ParticlesMaterial>();
+ SceneTree::add_idle_callback(ParticlesMaterial::flush_changes);
+ ParticlesMaterial::init_shaders();
#ifndef _3D_DISABLED
ClassDB::register_virtual_class<Mesh>();
@@ -580,10 +583,6 @@ void register_scene_types() {
SceneTree::add_idle_callback(SpatialMaterial::flush_changes);
SpatialMaterial::init_shaders();
- ClassDB::register_class<ParticlesMaterial>();
- SceneTree::add_idle_callback(ParticlesMaterial::flush_changes);
- ParticlesMaterial::init_shaders();
-
ClassDB::register_class<MultiMesh>();
ClassDB::register_class<MeshLibrary>();