mirror of
https://github.com/godotengine/godot
synced 2024-09-04 21:38:30 +00:00
Merge pull request #53712 from CakHuri/nullptr
Replace NULL with nullptr
This commit is contained in:
commit
88463c3eee
|
@ -110,7 +110,7 @@ void IPUnix::_resolve_hostname(List<IPAddress> &r_addresses, const String &p_hos
|
|||
struct addrinfo *next = result;
|
||||
|
||||
do {
|
||||
if (next->ai_addr == NULL) {
|
||||
if (next->ai_addr == nullptr) {
|
||||
next = next->ai_next;
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -525,7 +525,7 @@ Error VulkanContext::_check_capabilities() {
|
|||
// check our extended features
|
||||
VkPhysicalDeviceMultiviewFeatures multiview_features;
|
||||
multiview_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES;
|
||||
multiview_features.pNext = NULL;
|
||||
multiview_features.pNext = nullptr;
|
||||
|
||||
VkPhysicalDeviceFeatures2 device_features;
|
||||
device_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
|
||||
|
|
|
@ -114,7 +114,7 @@ bool xatlas_mesh_lightmap_unwrap_callback(float p_texel_size, const float *p_ver
|
|||
input_mesh.vertexPositionStride = sizeof(float) * 3;
|
||||
input_mesh.vertexNormalData = p_normals;
|
||||
input_mesh.vertexNormalStride = sizeof(uint32_t) * 3;
|
||||
input_mesh.vertexUvData = NULL;
|
||||
input_mesh.vertexUvData = nullptr;
|
||||
input_mesh.vertexUvStride = 0;
|
||||
|
||||
xatlas::ChartOptions chart_options;
|
||||
|
|
|
@ -3014,7 +3014,7 @@ void DisplayServerOSX::cursor_set_custom_image(const RES &p_cursor, CursorShape
|
|||
ERR_FAIL_COND(!image.is_valid());
|
||||
|
||||
NSBitmapImageRep *imgrep = [[NSBitmapImageRep alloc]
|
||||
initWithBitmapDataPlanes:NULL
|
||||
initWithBitmapDataPlanes:nullptr
|
||||
pixelsWide:int(texture_size.width)
|
||||
pixelsHigh:int(texture_size.height)
|
||||
bitsPerSample:8
|
||||
|
@ -3418,7 +3418,7 @@ void DisplayServerOSX::set_icon(const Ref<Image> &p_icon) {
|
|||
img = img->duplicate();
|
||||
img->convert(Image::FORMAT_RGBA8);
|
||||
NSBitmapImageRep *imgrep = [[NSBitmapImageRep alloc]
|
||||
initWithBitmapDataPlanes:NULL
|
||||
initWithBitmapDataPlanes:nullptr
|
||||
pixelsWide:img->get_width()
|
||||
pixelsHigh:img->get_height()
|
||||
bitsPerSample:8
|
||||
|
|
|
@ -1577,7 +1577,7 @@ void ArrayMesh::regen_normal_maps() {
|
|||
}
|
||||
|
||||
//dirty hack
|
||||
bool (*array_mesh_lightmap_unwrap_callback)(float p_texel_size, const float *p_vertices, const float *p_normals, int p_vertex_count, const int *p_indices, int p_index_count, const uint8_t *p_cache_data, bool *r_use_cache, uint8_t **r_mesh_cache, int *r_mesh_cache_size, float **r_uv, int **r_vertex, int *r_vertex_count, int **r_index, int *r_index_count, int *r_size_hint_x, int *r_size_hint_y) = NULL;
|
||||
bool (*array_mesh_lightmap_unwrap_callback)(float p_texel_size, const float *p_vertices, const float *p_normals, int p_vertex_count, const int *p_indices, int p_index_count, const uint8_t *p_cache_data, bool *r_use_cache, uint8_t **r_mesh_cache, int *r_mesh_cache_size, float **r_uv, int **r_vertex, int *r_vertex_count, int **r_index, int *r_index_count, int *r_size_hint_x, int *r_size_hint_y) = nullptr;
|
||||
|
||||
struct ArrayMeshLightmapSurface {
|
||||
Ref<Material> material;
|
||||
|
|
|
@ -9970,6 +9970,6 @@ RendererStorageRD::~RendererStorageRD() {
|
|||
|
||||
if (effects) {
|
||||
memdelete(effects);
|
||||
effects = NULL;
|
||||
effects = nullptr;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1284,7 +1284,7 @@ private:
|
|||
void _update_global_variables();
|
||||
/* EFFECTS */
|
||||
|
||||
EffectsRD *effects = NULL;
|
||||
EffectsRD *effects = nullptr;
|
||||
|
||||
public:
|
||||
virtual bool can_create_resources_async() const;
|
||||
|
|
Loading…
Reference in a new issue