Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 10 Dec 2018 01:45:38 +0000 (12:45 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 10 Dec 2018 01:45:38 +0000 (12:45 +1100)
commit155b02a1965745eeb876a338f7d8f23b4ba58c0c
treeb86a93a9aa079f1fb607e13225db1e1146c5abb8
parentcecd4fe2548c57d3ef11010e039410b793b675dd
parent642c315bae13ccb418ec767e6f29ca4e450dde5d
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_graph/space_graph.c
source/blender/makesdna/DNA_space_types.h