diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-12 22:30:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 22:30:43 +0200 |
| commit | 88463c3eee630ba780556918294744ba7125c94b (patch) | |
| tree | 3116fc88200f7e8174d841aed3455eb894cff744 /servers | |
| parent | 64ec08d70d9cec506df11b04541822ae1bd66a60 (diff) | |
| parent | 033dc4dbefed22aab7b58a60e27ce3c86943fe25 (diff) | |
Merge pull request #53712 from CakHuri/nullptr
Replace NULL with nullptr
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_storage_rd.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_storage_rd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/renderer_rd/renderer_storage_rd.cpp b/servers/rendering/renderer_rd/renderer_storage_rd.cpp index 2ece60e107..a7bfea455d 100644 --- a/servers/rendering/renderer_rd/renderer_storage_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_storage_rd.cpp @@ -9970,6 +9970,6 @@ RendererStorageRD::~RendererStorageRD() { if (effects) { memdelete(effects); - effects = NULL; + effects = nullptr; } } diff --git a/servers/rendering/renderer_rd/renderer_storage_rd.h b/servers/rendering/renderer_rd/renderer_storage_rd.h index d56afcc448..d6129bb57b 100644 --- a/servers/rendering/renderer_rd/renderer_storage_rd.h +++ b/servers/rendering/renderer_rd/renderer_storage_rd.h @@ -1284,7 +1284,7 @@ private: void _update_global_variables(); /* EFFECTS */ - EffectsRD *effects = NULL; + EffectsRD *effects = nullptr; public: virtual bool can_create_resources_async() const; |