diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-10 21:04:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-10 21:04:23 +0200 |
| commit | dcd11faad3802679a43b27155f1b6bc59aa39b60 (patch) | |
| tree | b91a7bcb89881e80a105710cd274993c98378029 /scene/3d/baked_lightmap.h | |
| parent | 4d2e50eca6f661c0cfb84a2f0b9c9ccd701a9576 (diff) | |
| parent | 26fcf2b04ca48566cee6cf32a2a40e8ea1e40eb4 (diff) | |
Merge pull request #40253 from madmiraal/add-override-keywords
Add override keywords.
Diffstat (limited to 'scene/3d/baked_lightmap.h')
| -rw-r--r-- | scene/3d/baked_lightmap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/3d/baked_lightmap.h b/scene/3d/baked_lightmap.h index 08098c3d5d..bebb579252 100644 --- a/scene/3d/baked_lightmap.h +++ b/scene/3d/baked_lightmap.h @@ -94,7 +94,7 @@ public: void clear(); - virtual RID get_rid() const; + virtual RID get_rid() const override; BakedLightmapData(); ~BakedLightmapData(); }; @@ -224,7 +224,7 @@ private: void _gen_new_positions_from_octree(const GenProbesOctree *p_cell, float p_cell_size, const Vector<Vector3> &probe_positions, LocalVector<Vector3> &new_probe_positions, HashMap<Vector3i, bool, Vector3iHash> &positions_used, const AABB &p_bounds); protected: - void _validate_property(PropertyInfo &property) const; + void _validate_property(PropertyInfo &property) const override; static void _bind_methods(); void _notification(int p_what); @@ -268,8 +268,8 @@ public: void set_generate_probes(GenerateProbes p_generate_probes); GenerateProbes get_generate_probes() const; - AABB get_aabb() const; - Vector<Face3> get_faces(uint32_t p_usage_flags) const; + AABB get_aabb() const override; + Vector<Face3> get_faces(uint32_t p_usage_flags) const override; BakeError bake(Node *p_from_node, String p_image_data_path = "", Lightmapper::BakeStepFunc p_bake_step = nullptr, void *p_bake_userdata = nullptr); BakedLightmap(); |