diff options
| author | Julian Eisel <julian@blender.org> | 2021-05-23 20:10:33 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-05-23 20:10:33 +0300 |
| commit | c7f23915bbe347b1a13c8551b09198d9e0a35d93 (patch) | |
| tree | 2b551130587b94cbc151bef7323870efc640051e /intern/cycles/blender/blender_sync.h | |
| parent | b0bca6f0889ebf345833b54a352640408e36c6a5 (diff) | |
| parent | f7b22fc3d27113715e8726c69ab3264e1d487439 (diff) | |
Merge branch 'master' into asset-system-filelist
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
0 files changed, 0 insertions, 0 deletions