diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-08-26 12:52:52 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-08-26 12:52:52 +0300 |
| commit | 6129e20cec4639aebf335ff13b2ba0c59670662d (patch) | |
| tree | a36691d3c487e376f0fa21676ca6e416f051e9a4 /source/blender/blenkernel/BKE_subdiv_ccg.h | |
| parent | 03bbd5f9dedf7b3dfea7119c172c61f0b50ae28c (diff) | |
| parent | 27787549256410b6b2de1eca47a2719830af7f96 (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c
Diffstat (limited to 'source/blender/blenkernel/BKE_subdiv_ccg.h')
0 files changed, 0 insertions, 0 deletions