diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-01-27 16:37:24 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-01-27 16:37:24 +0300 |
| commit | 6016dbb1a75566e1fb3ca257a1f13b9bba4467fd (patch) | |
| tree | 30ca1741378f36e7c6af17beb1b12c46fb487d05 /source/blender/blenkernel/BKE_subsurf.h | |
| parent | c453aaa0b2408b50af7d47722114f1903f27a6fc (diff) | |
| parent | 0379ddac7d68114798c8963821fd821c1b3d7d28 (diff) | |
Merge branch 'master' into temp-gpu-image-engine
# Conflicts:
# source/blender/blenkernel/CMakeLists.txt
# source/blender/draw/CMakeLists.txt
Diffstat (limited to 'source/blender/blenkernel/BKE_subsurf.h')
0 files changed, 0 insertions, 0 deletions