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 /scene | |
| parent | 64ec08d70d9cec506df11b04541822ae1bd66a60 (diff) | |
| parent | 033dc4dbefed22aab7b58a60e27ce3c86943fe25 (diff) | |
Merge pull request #53712 from CakHuri/nullptr
Replace NULL with nullptr
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/resources/mesh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index 18e6a51118..7ffe0b03e1 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -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; |