From a3462c97adc63461b12462d57c75a67ce54cecfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 3 Jun 2019 11:18:09 +0200 Subject: [PATCH] Bind missing FLAG_DISABLE_Z enum value in ParticlesMaterial Fixes #29419. --- doc/classes/ParticlesMaterial.xml | 7 ++++++- scene/resources/particles_material.cpp | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/classes/ParticlesMaterial.xml b/doc/classes/ParticlesMaterial.xml index 6ae5afeac51c..dd7a7cd1510c 100644 --- a/doc/classes/ParticlesMaterial.xml +++ b/doc/classes/ParticlesMaterial.xml @@ -214,14 +214,19 @@ Use with [method set_param], [method set_param_randomness], and [method set_param_texture] to set animation offset properties. + Represents the size of the [enum Parameter] enum. Use with [method set_flag] to set [member flag_align_y]. - Use with [method set_flag] to set [member flag_rotate_y] + Use with [method set_flag] to set [member flag_rotate_y]. + + + Use with [method set_flag] to set [member flag_disable_z]. + Represents the size of the [enum Flags] enum. All particles will be emitted from a single point. diff --git a/scene/resources/particles_material.cpp b/scene/resources/particles_material.cpp index ef67e6ea8095..758475b75e16 100644 --- a/scene/resources/particles_material.cpp +++ b/scene/resources/particles_material.cpp @@ -1186,6 +1186,7 @@ void ParticlesMaterial::_bind_methods() { BIND_ENUM_CONSTANT(FLAG_ALIGN_Y_TO_VELOCITY); BIND_ENUM_CONSTANT(FLAG_ROTATE_Y); + BIND_ENUM_CONSTANT(FLAG_DISABLE_Z); BIND_ENUM_CONSTANT(FLAG_MAX); BIND_ENUM_CONSTANT(EMISSION_SHAPE_POINT);