godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Replace NULL with nullptr

Browse Source
This commit is contained in:
lupoDharkael
2020-04-02 01:20:12 +02:00
parent 5f11e15571
commit 95a1400a2a
755 changed files with 5742 additions and 5742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
servers/rendering_server.cpp
View File

@@ -33,8 +33,8 @@
#include "core/method_bind_ext.gen.inc"
#include "core/project_settings.h"
RenderingServer *RenderingServer::singleton = NULL;
RenderingServer *(*RenderingServer::create_func)() = NULL;
RenderingServer *RenderingServer::singleton = nullptr;
RenderingServer *(*RenderingServer::create_func)() = nullptr;
RenderingServer *RenderingServer::get_singleton() {
@@ -43,12 +43,12 @@ RenderingServer *RenderingServer::get_singleton() {
RenderingServer *RenderingServer::create() {
ERR_FAIL_COND_V(singleton, NULL);
ERR_FAIL_COND_V(singleton, nullptr);
if (create_func)
return create_func();
return NULL;
return nullptr;
}
Array RenderingServer::_texture_debug_usage_bind() {
@@ -333,7 +333,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint
uint8_t *vw = r_vertex_array.ptrw();
uint8_t *iw = NULL;
uint8_t *iw = nullptr;
if (r_index_array.size()) {
iw = r_index_array.ptrw();
}
@@ -2363,5 +2363,5 @@ RenderingServer::RenderingServer() {
RenderingServer::~RenderingServer() {
singleton = NULL;
singleton = nullptr;
}