Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 10 Dec 2018 01:44:24 +0000 (12:44 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 10 Dec 2018 01:44:24 +0000 (12:44 +1100)
commitcecd4fe2548c57d3ef11010e039410b793b675dd
treeb456c5b7328bb85334e7e55378d8c75580317a12
parent168a6a4bfc13cbe5c2fb510607b9565de3eb9472
parent9df2b6da3a718323dbe9431c5a4b43fc309fa4b9
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_action/space_action.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_graph/space_graph.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c