Browse Source

Merge pull request #29422 from akien-mga/particlesmaterial-missing-enum-value

Bind missing FLAG_DISABLE_Z enum value in ParticlesMaterial
Rémi Verschelde 6 years ago
parent
commit
1e55f8a241
2 changed files with 7 additions and 1 deletions
  1. 6 1
      doc/classes/ParticlesMaterial.xml
  2. 1 0
      scene/resources/particles_material.cpp

+ 6 - 1
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.

+ 1 - 0
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);