diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-07-20 05:50:45 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-07-20 05:50:45 +0300 |
| commit | 8c5d90f5ce928e45249ddd9f642c24b6dd69d64c (patch) | |
| tree | ccbbf8f065eadbe85cdc1f8d70a9d036e9c030b5 /source/blender/gpu/opengl/gl_texture.hh | |
| parent | 111bf7d76b080555fd524b2b4a138bcad2e5b206 (diff) | |
| parent | 215f805ce6b540177dedd71721e62c56a764a5ea (diff) | |
Merge branch 'master' into temp-legacy-mesh-format-optiontemp-legacy-mesh-format-option
Diffstat (limited to 'source/blender/gpu/opengl/gl_texture.hh')
| -rw-r--r-- | source/blender/gpu/opengl/gl_texture.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/opengl/gl_texture.hh b/source/blender/gpu/opengl/gl_texture.hh index e5b879f1f15..aeb9fc0e6b7 100644 --- a/source/blender/gpu/opengl/gl_texture.hh +++ b/source/blender/gpu/opengl/gl_texture.hh @@ -33,7 +33,7 @@ class GLTexture : public Texture { /** opengl identifier for texture. */ GLuint tex_id_ = 0; /** Legacy workaround for texture copy. Created when using framebuffer_get(). */ - struct GPUFrameBuffer *framebuffer_ = NULL; + struct GPUFrameBuffer *framebuffer_ = nullptr; /** True if this texture is bound to at least one texture unit. */ /* TODO(fclem): How do we ensure thread safety here? */ bool is_bound_ = false; |