diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-03 12:24:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 12:24:40 +0200 |
| commit | 1e55f8a241a8d65ef562ca91ab35b49818120ca5 (patch) | |
| tree | 297b5ff3bc35010b2dafebdd501fe24c5f33e105 | |
| parent | c661d21ffb79ed050010c047c02e2b2fc4b057e7 (diff) | |
| parent | a3462c97adc63461b12462d57c75a67ce54cecfd (diff) | |
| download | redot-engine-1e55f8a241a8d65ef562ca91ab35b49818120ca5.tar.gz | |
Merge pull request #29422 from akien-mga/particlesmaterial-missing-enum-value
Bind missing FLAG_DISABLE_Z enum value in ParticlesMaterial
| -rw-r--r-- | doc/classes/ParticlesMaterial.xml | 7 | ||||
| -rw-r--r-- | scene/resources/particles_material.cpp | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/classes/ParticlesMaterial.xml b/doc/classes/ParticlesMaterial.xml index 6ae5afeac5..dd7a7cd151 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. </constant> <constant name="PARAM_MAX" value="12" enum="Parameter"> + Represents the size of the [enum Parameter] enum. </constant> <constant name="FLAG_ALIGN_Y_TO_VELOCITY" value="0" enum="Flags"> Use with [method set_flag] to set [member flag_align_y]. </constant> <constant name="FLAG_ROTATE_Y" value="1" enum="Flags"> - Use with [method set_flag] to set [member flag_rotate_y] + Use with [method set_flag] to set [member flag_rotate_y]. + </constant> + <constant name="FLAG_DISABLE_Z" value="2" enum="Flags"> + Use with [method set_flag] to set [member flag_disable_z]. </constant> <constant name="FLAG_MAX" value="3" enum="Flags"> + Represents the size of the [enum Flags] enum. </constant> <constant name="EMISSION_SHAPE_POINT" value="0" enum="EmissionShape"> All particles will be emitted from a single point. diff --git a/scene/resources/particles_material.cpp b/scene/resources/particles_material.cpp index ef67e6ea80..758475b75e 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); |