diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2021-05-26 13:43:03 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2021-05-26 13:43:03 +0300 |
| commit | 8a6604f253e22bbade3dcf60b9a1c437ace44151 (patch) | |
| tree | fee875d0a0b09fbe0df52aa83094159144048205 /source/blender/gpu/opengl/gl_batch.cc | |
| parent | edf1b833674a6e54df7a16c14f0c6193fbbb482e (diff) | |
| parent | afec66c024dc2b75447537d45406c06342ec201e (diff) | |
Merge branch 'master' into temp-gpencil-maskingtemp-gpencil-masking
Conflicts:
source/blender/blenloader/intern/versioning_300.c
Diffstat (limited to 'source/blender/gpu/opengl/gl_batch.cc')
| -rw-r--r-- | source/blender/gpu/opengl/gl_batch.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/opengl/gl_batch.cc b/source/blender/gpu/opengl/gl_batch.cc index 976a31ab5cb..fc1d1006d0d 100644 --- a/source/blender/gpu/opengl/gl_batch.cc +++ b/source/blender/gpu/opengl/gl_batch.cc @@ -44,7 +44,7 @@ using namespace blender::gpu; /* -------------------------------------------------------------------- */ -/** \name Vao cache +/** \name VAO Cache * * Each #GLBatch has a small cache of VAO objects that are used to avoid VAO reconfiguration. * TODO(fclem): Could be revisited to avoid so much cross references. |