Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 3 Jun 2018 09:24:57 +0000 (11:24 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 3 Jun 2018 09:24:57 +0000 (11:24 +0200)
commit38bf3b8d23041c547186fee5633782384c8ab384
treeaeef142996ff766f6e679c2f70ba2070b83b366f
parent18a45538384564a5dffbdd88b778bb10da92a7b2
parent6221180963c39f9f3f95982070ff6f381ab7e0b2
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/versioning_legacy.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_view3d_types.h