diff options
| author | lupoDharkael <izhe@hotmail.es> | 2020-04-02 01:20:12 +0200 |
|---|---|---|
| committer | lupoDharkael <izhe@hotmail.es> | 2020-04-02 13:38:00 +0200 |
| commit | 95a1400a2ac9de1a29fa305f45b928ce8e3044bd (patch) | |
| tree | be0cd59e5a90926e9d653fed9f3b1b77e735ca2f /modules/pvr | |
| parent | 5f11e1557156617366d2c316a97716172103980d (diff) | |
| download | redot-engine-95a1400a2ac9de1a29fa305f45b928ce8e3044bd.tar.gz | |
Replace NULL with nullptr
Diffstat (limited to 'modules/pvr')
| -rw-r--r-- | modules/pvr/texture_loader_pvr.cpp | 2 | ||||
| -rw-r--r-- | modules/pvr/texture_loader_pvr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/pvr/texture_loader_pvr.cpp b/modules/pvr/texture_loader_pvr.cpp index 179c6f692b..10d4d71f5e 100644 --- a/modules/pvr/texture_loader_pvr.cpp +++ b/modules/pvr/texture_loader_pvr.cpp @@ -534,7 +534,7 @@ static void decompress_pvrtc(PVRTCBlock *p_comp_img, const int p_2bit, const int // local neighbourhood of blocks PVRTCBlock *p_blocks[2][2]; - PVRTCBlock *prev[2][2] = { { NULL, NULL }, { NULL, NULL } }; + PVRTCBlock *prev[2][2] = { { nullptr, nullptr }, { nullptr, nullptr } }; struct { diff --git a/modules/pvr/texture_loader_pvr.h b/modules/pvr/texture_loader_pvr.h index c990c3612b..642323db35 100644 --- a/modules/pvr/texture_loader_pvr.h +++ b/modules/pvr/texture_loader_pvr.h @@ -36,7 +36,7 @@ class ResourceFormatPVR : public ResourceFormatLoader { public: - virtual RES load(const String &p_path, const String &p_original_path, Error *r_error = NULL, bool p_use_sub_threads = false, float *r_progress = nullptr); + virtual RES load(const String &p_path, const String &p_original_path, Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr); virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual bool handles_type(const String &p_type) const; virtual String get_resource_type(const String &p_path) const; |