diff options
Diffstat (limited to 'scene/resources/particles_material.h')
| -rw-r--r-- | scene/resources/particles_material.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/scene/resources/particles_material.h b/scene/resources/particles_material.h index c6c8316995..1c1b6c92f9 100644 --- a/scene/resources/particles_material.h +++ b/scene/resources/particles_material.h @@ -35,7 +35,6 @@ #define PARTICLES_MATERIAL_H class ParticlesMaterial : public Material { - GDCLASS(ParticlesMaterial, Material); public: @@ -74,7 +73,6 @@ public: private: union MaterialKey { - struct { uint32_t texture_mask : 16; uint32_t texture_color : 1; @@ -103,7 +101,6 @@ private: MaterialKey current_key; _FORCE_INLINE_ MaterialKey _compute_key() const { - MaterialKey mk; mk.key = 0; for (int i = 0; i < PARAM_MAX; i++) { @@ -234,7 +231,7 @@ private: protected: static void _bind_methods(); - virtual void _validate_property(PropertyInfo &property) const; + virtual void _validate_property(PropertyInfo &property) const override; public: void set_direction(Vector3 p_direction); @@ -301,7 +298,7 @@ public: RID get_shader_rid() const; - virtual Shader::Mode get_shader_mode() const; + virtual Shader::Mode get_shader_mode() const override; ParticlesMaterial(); ~ParticlesMaterial(); |