diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-08-15 14:02:45 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-08-15 14:02:45 +0300 |
| commit | 3bca9f5fed1f6d3dd485e3cff2174c3394bb1162 (patch) | |
| tree | 7083a56f6b8db22ad51a6319f7281cb4d7124c12 /source/blender/editors/transform/transform_orientations.c | |
| parent | 3311505fd07310a6bfac79ce787dbd394002dd1f (diff) | |
| parent | f20d7bed1426ca3d1268182835f04e7ab8212cac (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/makesrna/intern/rna_render.c
Diffstat (limited to 'source/blender/editors/transform/transform_orientations.c')
0 files changed, 0 insertions, 0 deletions