diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-04-17 16:16:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-04-17 16:16:16 +0300 |
| commit | 795a874d0ba84bdb875398e75a7b902f9ebc0880 (patch) | |
| tree | 78bc372cb0a7598a3d5f4699119ca921542dd505 /tests | |
| parent | c87dd76937f026c4a154dc4073063959f3e5a87e (diff) | |
| parent | c565d0764f75ba5a5bb51d5daa9152897db59eb8 (diff) | |
Merge branch 'blender-v2.83-release'
Conflicts:
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions