diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2018-02-24 16:02:50 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2018-02-24 16:02:50 +0300 |
| commit | 94eb1897523d4cf464ea0cdf90ccbd7db90f997d (patch) | |
| tree | bcb82d0c8360f195046ab93b1a222acf0ad0f4f1 /source/blender/makesrna/intern/rna_scene_api.c | |
| parent | c4abb331027ab294618c5ab49d3f9d2dfc67596f (diff) | |
| parent | 4403ca80bda690c0ac44e4a6db0cddf4b2428006 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_blender_version.h
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene_api.c')
0 files changed, 0 insertions, 0 deletions