diff options
| author | Colin Basnett <cmbasnett@gmail.com> | 2022-09-17 03:50:37 +0300 |
|---|---|---|
| committer | Colin Basnett <cmbasnett@gmail.com> | 2022-09-17 03:50:37 +0300 |
| commit | 564bda241a973396da51d7c3ccd9efd97d51728a (patch) | |
| tree | 4d9aa4cccd82e2e606b47774afa5e1015bf14768 /source/blender/gpu/intern/gpu_immediate_private.hh | |
| parent | 0fff238150d076576053c25b646f653d6e3b0edb (diff) | |
| parent | 48d7ff68f0df209c77bbb081ab46fbc109fd825a (diff) | |
Merge branch 'master' into feature-imformatfeature-imformat
Diffstat (limited to 'source/blender/gpu/intern/gpu_immediate_private.hh')
| -rw-r--r-- | source/blender/gpu/intern/gpu_immediate_private.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/gpu/intern/gpu_immediate_private.hh b/source/blender/gpu/intern/gpu_immediate_private.hh index 6c50fa01071..74ebbdc7ae3 100644 --- a/source/blender/gpu/intern/gpu_immediate_private.hh +++ b/source/blender/gpu/intern/gpu_immediate_private.hh @@ -19,7 +19,7 @@ namespace blender::gpu { class Immediate { public: /** Pointer to the mapped buffer data for the current vertex. */ - uchar *vertex_data = NULL; + uchar *vertex_data = nullptr; /** Current vertex index. */ uint vertex_idx = 0; /** Length of the buffer in vertices. */ @@ -32,12 +32,12 @@ class Immediate { /** Current draw call specification. */ GPUPrimType prim_type = GPU_PRIM_NONE; GPUVertFormat vertex_format = {}; - GPUShader *shader = NULL; + GPUShader *shader = nullptr; /** Enforce strict vertex count (disabled when using #immBeginAtMost). */ bool strict_vertex_len = true; /** Batch in construction when using #immBeginBatch. */ - GPUBatch *batch = NULL; + GPUBatch *batch = nullptr; /** Wide Line workaround. */ |