diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-02 14:32:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 14:32:06 +0200 |
| commit | 0b73a9e403a99af7c909908866d2b7822ddf3d44 (patch) | |
| tree | 2a52e9e530d0fd9c93ae9c5ffa5ea8055b064087 /scene/3d | |
| parent | 0f4c30fb7166e84d93f0b2cb20d726f869155d98 (diff) | |
| parent | c026e3957a815199ee301cdcbaa94698ee4a3705 (diff) | |
Merge pull request #22618 from akien-mga/fix-warnings
Fix warnings on virtual methods [-Woverloaded-virtual] [-Wdelete-non-…
Diffstat (limited to 'scene/3d')
| -rw-r--r-- | scene/3d/physics_body.h | 2 | ||||
| -rw-r--r-- | scene/3d/visibility_notifier.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index ca48b51ffb..ed9f41197b 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -389,6 +389,8 @@ public: virtual bool _set(const StringName &p_name, const Variant &p_value, RID j = RID()); virtual bool _get(const StringName &p_name, Variant &r_ret) const; virtual void _get_property_list(List<PropertyInfo> *p_list) const; + + virtual ~JointData() {} }; struct PinJointData : public JointData { diff --git a/scene/3d/visibility_notifier.h b/scene/3d/visibility_notifier.h index b1985f4a0c..2cf685a92c 100644 --- a/scene/3d/visibility_notifier.h +++ b/scene/3d/visibility_notifier.h @@ -48,7 +48,7 @@ protected: void _notification(int p_what); static void _bind_methods(); - friend class SpatialIndexer; + friend struct SpatialIndexer; void _enter_camera(Camera *p_camera); void _exit_camera(Camera *p_camera); |