diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-02-07 18:38:21 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-02-07 18:38:21 +0300 |
| commit | c9ebd5fc16a33669dd8b8cc74b52298616ec42f1 (patch) | |
| tree | d946506b362c155be5e26e38e11f210cffbf5a02 /source/blender/blenkernel/BKE_addon.h | |
| parent | 2a84bfccdd5d92876a0704b4553255f33a31a3a3 (diff) | |
| parent | c0146170af9175120b06416364e021ddbb5f4771 (diff) | |
Merge branch 'greasepencil-object' into greasepencil-refactor
Conflicts:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/blenkernel/BKE_addon.h')
0 files changed, 0 insertions, 0 deletions